begin order form with registration
This commit is contained in:
Ludovic CANDELLIER
@@ -53,7 +53,7 @@
|
||||
'Ajout dans le panier',
|
||||
'basket-form',
|
||||
"{{ route('Shop.Basket.modalBasket') }}/" + offer_id + '/' + quantity,
|
||||
"{{ route('Shop.Orders.create') }}",
|
||||
"{{ route('Shop.Orders.order') }}",
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
|
||||
@@ -28,47 +28,14 @@
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="col-4">
|
||||
@component('components.card', ['class' => 'shadow bg-light'])
|
||||
<div class="row mb-3">
|
||||
<div class="col-6 text-uppercase">
|
||||
Tarif appliqué
|
||||
<span id="basket_sale_channel"></span>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
{{ $sale_channel['name'] ?? '' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-3">
|
||||
<div class="col-6">
|
||||
<span id="basket-count"></span> ARTICLES
|
||||
</div>
|
||||
<div class="col-6 text-right font-weight-bold">
|
||||
<span id="basket-total"></span> €
|
||||
</div>
|
||||
</div>
|
||||
<div class="row m-3">
|
||||
<div class="col-6">
|
||||
LIVRAISON
|
||||
</div>
|
||||
<div class="col-6 text-right font-weight-bold">
|
||||
<span id="shipping">5</span> €
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row m-3 font-weight-bold" style="font-size: 1.6em;">
|
||||
<div class="col-6">
|
||||
TOTAL TTC
|
||||
</div>
|
||||
<div class="col-6 text-right">
|
||||
<span id="basket-total-shipped"></span> €
|
||||
</div>
|
||||
</div>
|
||||
<x-card class='shadow bg-light'>
|
||||
@include('Shop.Baskets.partials.basketTotal')
|
||||
<div class="row m-3">
|
||||
<div class="col-12 text-center">
|
||||
<a href="" class="btn btn-green-dark">COMMANDER</a>
|
||||
<a href="{{ route('Shop.Orders.order') }}" class="btn btn-green-dark">COMMANDER</a>
|
||||
</div>
|
||||
</div>
|
||||
@endcomponent
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
35
resources/views/Shop/Baskets/partials/basketTotal.blade.php
Normal file
35
resources/views/Shop/Baskets/partials/basketTotal.blade.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<div class="row mb-3">
|
||||
<div class="col-6 text-uppercase">
|
||||
Tarif appliqué :
|
||||
</div>
|
||||
<div class="col-6 text-right font-weight-bold">
|
||||
<span id="basket_sale_channel">
|
||||
{{ $sale_channel['name'] ?? null }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-6">
|
||||
<span id="basket-count">{{ $basket['count'] ?? 0 }}</span> ARTICLES
|
||||
</div>
|
||||
<div class="col-6 text-right font-weight-bold">
|
||||
<span id="basket-total">{{ $basket['total'] ?? 0 }}</span> €
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-6">
|
||||
LIVRAISON
|
||||
</div>
|
||||
<div class="col-6 text-right font-weight-bold">
|
||||
<span id="shipping">5</span> €
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-3 font-weight-bold" style="font-size: 1.6em;">
|
||||
<div class="col-6">
|
||||
TOTAL TTC
|
||||
</div>
|
||||
<div class="col-6 text-right">
|
||||
<span id="basket-total-shipped">{{ ($basket['total'] ?? 0) + 5 }}</span> €
|
||||
</div>
|
||||
</div>
|
||||
43
resources/views/Shop/Orders/order.blade.php
Normal file
43
resources/views/Shop/Orders/order.blade.php
Normal file
@@ -0,0 +1,43 @@
|
||||
@extends('Shop.layout.layout', [
|
||||
'title' => __('Commande'),
|
||||
])
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
Déja client ?
|
||||
<button class="btn">Créez mon compte</button>
|
||||
|
||||
<x-layout.collapse id="identification" title="Déjà client">
|
||||
@include('Shop.auth.partials.login')
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="personal_data" title="Informations personnelles">
|
||||
@include('Shop.auth.partials.register')
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="adresses" title="Adresses">
|
||||
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="delivery_mode" title="Mode de livraison">
|
||||
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="payment" title="Paiement">
|
||||
|
||||
</x-layout.collapse>
|
||||
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<x-card class='shadow bg-light'>
|
||||
@include('Shop.Baskets.partials.basketTotal')
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@push('js')
|
||||
<script>
|
||||
</script>
|
||||
@endpush
|
||||
@@ -1,9 +1,11 @@
|
||||
<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
|
||||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
@@ -4,45 +4,14 @@
|
||||
])
|
||||
|
||||
@section('content')
|
||||
{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
<div class="row" style="width: 380px;">
|
||||
<div class="col-12 text-center">
|
||||
<img src="/img/logo.png" height="128">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group has-feedback">
|
||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
|
||||
<span class="fa fa-email form-control-feedback"></span>
|
||||
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }}
|
||||
<span class="fa fa-lock form-control-feedback"></span>
|
||||
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 col-lg-6 mbs">
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ __('Se connecter') }}</button>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-lg-6">
|
||||
<a href="{{ route('Shop.password.reset') }}">{{ __('Mot de passe oublié ?') }}</a><br>
|
||||
<!--
|
||||
<div class="checkbox icheck">
|
||||
<label style="padding-left: 0">
|
||||
<input type="checkbox" name="remember" class="icheck" {{ old('remember') ? 'checked' : '' }}>
|
||||
{{ __('boilerplate::auth.login.rememberme') }}
|
||||
</label>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
<div class="row" style="width: 380px;">
|
||||
<div class="col-12 text-center">
|
||||
<img src="/img/logo.png" height="128">
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
||||
@include('Shop.auth.partials.login')
|
||||
|
||||
<p class="mt-3">
|
||||
Vous n'avez pas encore de compte ?
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
@if (config('app.name') == 'CRM')
|
||||
@include('auth.crm')
|
||||
|
||||
@endif
|
||||
|
||||
@if (config('app.name') == 'HestImmo')
|
||||
@include('auth.hestimmo')
|
||||
@endif
|
||||
34
resources/views/Shop/auth/partials/login.blade.php
Normal file
34
resources/views/Shop/auth/partials/login.blade.php
Normal file
@@ -0,0 +1,34 @@
|
||||
{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
|
||||
<div class="form-group has-feedback">
|
||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
|
||||
<span class="fa fa-email form-control-feedback"></span>
|
||||
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password')]) }}
|
||||
<span class="fa fa-lock form-control-feedback"></span>
|
||||
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12 col-lg-6 mbs">
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ __('Se connecter') }}</button>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-lg-6">
|
||||
<a href="{{ route('Shop.password.reset') }}">{{ __('Mot de passe oublié ?') }}</a><br>
|
||||
<!--
|
||||
<div class="checkbox icheck">
|
||||
<label style="padding-left: 0">
|
||||
<input type="checkbox" name="remember" class="icheck" {{ old('remember') ? 'checked' : '' }}>
|
||||
{{ __('boilerplate::auth.login.rememberme') }}
|
||||
</label>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
117
resources/views/Shop/auth/partials/register.blade.php
Normal file
117
resources/views/Shop/auth/partials/register.blade.php
Normal file
@@ -0,0 +1,117 @@
|
||||
{!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<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">
|
||||
<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'), 'required']) }}
|
||||
{!! $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="col-6">
|
||||
<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
|
||||
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }}
|
||||
{!! $errors->first('password_confirmation','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@include('components.form.checkbox', ['name' => 'use_for_invoice', 'value' => false])
|
||||
Utiliser aussi cette adresse pour la facturation
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</x-card>
|
||||
|
||||
<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">
|
||||
{{ __('boilerplate::auth.register.register_button') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
@@ -4,97 +4,5 @@
|
||||
])
|
||||
|
||||
@section('content')
|
||||
{!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
@component('components.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-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'), 'required']) }}
|
||||
{!! $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'), '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'), 'required']) }}
|
||||
{!! $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="col-6">
|
||||
<div class="form-group {{ $errors->has('password') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
|
||||
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<div class="form-group {{ $errors->has('password_confirmation') ? 'has-error' : '' }}">
|
||||
{{ Form::password('password_confirmation', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password_confirm'), 'required']) }}
|
||||
{!! $errors->first('password_confirmation','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endcomponent
|
||||
|
||||
<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">
|
||||
{{ __('boilerplate::auth.register.register_button') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
@include('Shop.auth.partials.register')
|
||||
@endsection
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
<footer id="footer">
|
||||
|
||||
<hr>
|
||||
{!! $footer ?? null !!}
|
||||
{!! $extra_footer ?? null !!}
|
||||
</footer>
|
||||
|
||||
Reference in New Issue
Block a user