[WIP] Order process
This commit is contained in:
Ludovic CANDELLIER
@@ -8,15 +8,15 @@
|
||||
<div class="col-6">
|
||||
<div class="row">
|
||||
<div class="col-5">
|
||||
{{ Form::label('active', __('active')) }}<br/>
|
||||
{{ Form::label('active', __('Actif')) }}<br/>
|
||||
@include("components.form.toggle", ['name' => 'active', 'value' => $delivery['active'] ?? false, 'on' => __('active'), 'off' => __('inactive')])
|
||||
</div>
|
||||
<div class="col-3">
|
||||
{{ Form::label('is_public', __('type')) }}
|
||||
{{ Form::label('is_public', __('Type')) }}
|
||||
@include('components.form.toggle', ['name' => 'is_public', 'value' => $delivery['is_public'] ?? false, 'on' => __('public'), 'off' => __('administré')])
|
||||
</div>
|
||||
<div class="col-4">
|
||||
{{ Form::label('at_house', __('defaut')) }}
|
||||
{{ Form::label('at_house', __('Défaut')) }}
|
||||
@include('components.form.checkboxes.icheck', ['name' => 'at_house', 'value' => $delivery['at_house'] ?? null])
|
||||
</div>
|
||||
</div>
|
||||
@@ -24,20 +24,27 @@
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12">
|
||||
{{ Form::label('name', __('name')) }}
|
||||
{{ Form::label('name', __('Nom')) }}
|
||||
@include('components.form.input', ['name' => 'name', 'value' => $delivery['name'] ?? null, 'required' => true])
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-12">
|
||||
{{ Form::label('', __('Description')) }}
|
||||
<textarea name="description" class="form-control">{{ $delivery['description'] }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('components.address', ['with_country' => false])
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-3">
|
||||
{{ Form::label('event_date_begin', __('date')) }}
|
||||
{{ Form::label('event_date_begin', __('Date de début')) }}
|
||||
@include('components.form.datepicker', ['name' => 'event_date_begin', 'value' => $delivery['event_date_begin'] ?? null])
|
||||
</div>
|
||||
<div class="col-3">
|
||||
{{ Form::label('event_date_end', __('date')) }}
|
||||
{{ Form::label('event_date_end', __('Date de fin')) }}
|
||||
@include('components.form.datepicker', ['name' => 'event_date_end', 'value' => $delivery['event_date_end'] ?? null])
|
||||
</div>
|
||||
|
||||
|
||||
@@ -5,29 +5,33 @@
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
Déja client ?
|
||||
<button class="btn">Créez mon compte</button>
|
||||
@if (!App\Repositories\Shop\Customers::isConnected())
|
||||
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="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="personal_data" title="Informations personnelles">
|
||||
@include('Shop.auth.partials.register')
|
||||
</x-layout.collapse>
|
||||
@endif
|
||||
|
||||
<x-layout.collapse id="adresses" title="Adresses">
|
||||
|
||||
</x-layout.collapse>
|
||||
{{ Form::open(['route' => 'Admin.Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
|
||||
|
||||
<x-layout.collapse id="delivery_mode" title="Mode de livraison">
|
||||
|
||||
</x-layout.collapse>
|
||||
<x-layout.collapse id="adresses" title="Adresses">
|
||||
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="payment" title="Paiement">
|
||||
|
||||
</x-layout.collapse>
|
||||
<x-layout.collapse id="delivery_mode" title="Mode de livraison">
|
||||
@include('Shop.Orders.partials.deliveries')
|
||||
</x-layout.collapse>
|
||||
|
||||
<x-layout.collapse id="payment" title="Paiement">
|
||||
@include('Shop.Orders.partials.payments')
|
||||
</x-layout.collapse>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<x-card class='shadow bg-light'>
|
||||
|
||||
15
resources/views/Shop/Orders/partials/deliveries.blade.php
Normal file
15
resources/views/Shop/Orders/partials/deliveries.blade.php
Normal file
@@ -0,0 +1,15 @@
|
||||
@foreach ($deliveries as $delivery)
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
<x-form.radios.icheck name="delivery_id" val="{{ $delivery['id'] }}" id="delivery_{{ $delivery['id'] }}"/>
|
||||
</div>
|
||||
<div class="col-11">
|
||||
<strong>{{ $delivery['name'] }} - Tarif appliqué {{ $delivery['sale_channel']['name'] }}</strong><br/>
|
||||
{!! $delivery['sale_channel']['description'] !!}
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
|
||||
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le rensiegner dans le champs ci-contre
|
||||
|
||||
<textarea name="comment" class="form-control"></textarea>
|
||||
37
resources/views/Shop/Orders/partials/payments.blade.php
Normal file
37
resources/views/Shop/Orders/partials/payments.blade.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
<x-form.radios.icheck name="payment" val="card" id="payment_card"/>
|
||||
</div>
|
||||
<div class="col-11">
|
||||
PAIEMENT PAR CARTE BANCAIRE
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
<x-form.radios.icheck name="payment" val="check" id="payment_check"/>
|
||||
</div>
|
||||
<div class="col-11">
|
||||
PAIEMENT PAR CHEQUE
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
<x-form.radios.icheck name="payment" val="transfer" id="payment_transfer"/>
|
||||
</div>
|
||||
<div class="col-11">
|
||||
PAIEMENT PAR VIREMENT BANCAIRE
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row pt-5">
|
||||
<div class="col-1">
|
||||
<x-form.checkboxes.icheck name="agree" val="1"/>
|
||||
</div>
|
||||
<div class="col-11">
|
||||
J'ai lu les conditions générales de vente et j'y adhère sans réserve
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary mt-5">COMMANDE AVEC OBLIGATION DE PAIEMENT</button>
|
||||
@@ -11,6 +11,13 @@
|
||||
@stack('css')
|
||||
</head>
|
||||
<body class="{{ $bodyClass ?? 'login-page'}}">
|
||||
|
||||
<div class="row" style="width: 380px;">
|
||||
<div class="col-12 text-center">
|
||||
<img src="/img/logo.png" height="128">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@yield('content')
|
||||
<script src="{{ mix('/boilerplate.min.js', '/assets/vendor/boilerplate') }}"></script>
|
||||
@stack('js')
|
||||
|
||||
@@ -1,16 +1,10 @@
|
||||
@extends('auth.layout', [
|
||||
@extends('Shop.auth.layout', [
|
||||
'title' => __('boilerplate::auth.login.title'),
|
||||
'bodyClass' => 'hold-transition login-page'
|
||||
])
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row" style="width: 380px;">
|
||||
<div class="col-12 text-center">
|
||||
<img src="/img/logo.png" height="128">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('Shop.auth.partials.login')
|
||||
|
||||
<p class="mt-3">
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-lg-6">
|
||||
<a href="{{ route('Shop.password.reset') }}">{{ __('Mot de passe oublié ?') }}</a><br>
|
||||
<a href="{{ route('Shop.password.request') }}">{{ __('Mot de passe oublié ?') }}</a><br>
|
||||
<!--
|
||||
<div class="checkbox icheck">
|
||||
<label style="padding-left: 0">
|
||||
|
||||
16
resources/views/Shop/auth/partials/lost_password.blade.php
Normal file
16
resources/views/Shop/auth/partials/lost_password.blade.php
Normal file
@@ -0,0 +1,16 @@
|
||||
{!! Form::open(['route' => 'Shop.password.email', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
|
||||
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<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.password.submit') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
<a href="{{ route('Shop.login') }}">{{ __('boilerplate::auth.password.login_link') }}</a><br>
|
||||
@@ -1,28 +1,13 @@
|
||||
@extends('boilerplate::auth.layout', ['title' => __('boilerplate::auth.password.title'), 'bodyClass' => 'hold-transition login-page'])
|
||||
@extends('Shop.auth.layout', ['title' => __('boilerplate::auth.password.title'), 'bodyClass' => 'hold-transition login-page'])
|
||||
|
||||
@section('content')
|
||||
@component('boilerplate::auth.loginbox')
|
||||
<p class="login-box-msg">{{ __('boilerplate::auth.password.intro') }}</p>
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
{!! Form::open(['route' => 'boilerplate.password.email', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
|
||||
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="row">
|
||||
<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.password.submit') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
<a href="{{ route('boilerplate.login') }}">{{ __('boilerplate::auth.password.login_link') }}</a><br>
|
||||
@endcomponent
|
||||
|
||||
<p class="login-box-msg">{{ __('boilerplate::auth.password.intro') }}</p>
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@include('Shop.auth.partials.lost_password')
|
||||
@endsection
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
@extends('boilerplate::auth.layout', ['title' => __('boilerplate::auth.password_reset.title')])
|
||||
@extends('Shop.auth.layout', [
|
||||
'title' => __('boilerplate::auth.password_reset.title'),
|
||||
'bodyClass' => 'hold-transition login-page'
|
||||
])
|
||||
|
||||
@section('content')
|
||||
@component('boilerplate::auth.loginbox')
|
||||
<p class="login-box-msg">{{ __('boilerplate::auth.password_reset.intro') }}</p>
|
||||
{!! Form::open(['route' => 'boilerplate.password.reset.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
{!! Form::open(['route' => 'Shop.password.update', 'method' => 'post', 'autocomplete'=> 'off']) !!}
|
||||
{!! Form::hidden('token', $token) !!}
|
||||
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
|
||||
{{ Form::email('email', old('email', $email), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
|
||||
|
||||
@@ -1,20 +1,37 @@
|
||||
<div class="row">
|
||||
<div class="col-12 text-right p-2">
|
||||
<button type="button" class="btn bg-green-dark light" data-toggle="dropdown">
|
||||
<i class="fa fa-2x fa-fw fa-user mr-2"></i>
|
||||
@if (App\Repositories\Shop\Customers::getName())
|
||||
<span id="username" class="ml-2 badge bg-yellow green-dark">
|
||||
{{ App\Repositories\Shop\Customers::getName() }}
|
||||
</span>
|
||||
@if (App\Repositories\Shop\Customers::isConnected())
|
||||
<img src="{{ App\Repositories\Shop\Customers::getAvatar() }}" class="img-fluid">
|
||||
@else
|
||||
<i class="fa fa-2x fa-fw fa-user mr-2"></i>
|
||||
@endif
|
||||
</button>
|
||||
|
||||
<ul class="dropdown-menu" aria-labelledby="dLabel">
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.login') }}" title="Identifiez-vous" rel="nofollow">
|
||||
<span>Connexion</span>
|
||||
</a>
|
||||
</li>
|
||||
@if (App\Repositories\Shop\Customers::isConnected())
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.Customers.profile') }}" title="Accèdez à vos factures, remises ..." rel="nofollow">
|
||||
<span>Votre compte</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.logout') }}" title="Vous déconnectez" rel="nofollow">
|
||||
<span>Se déconnecter</span>
|
||||
</a>
|
||||
</li>
|
||||
@else
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.login') }}" title="Identifiez-vous" rel="nofollow">
|
||||
<span>Connexion</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.register') }}" title="Enregistrez-vous" rel="nofollow">
|
||||
<span>Creer votre compte</span>
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
4
resources/views/components/form/radio.blade.php
Normal file
4
resources/views/components/form/radio.blade.php
Normal file
@@ -0,0 +1,4 @@
|
||||
<input type="radio" name="{{ $name }}" id="{{ $id_name ?? $id ?? $name }}" class="{{ $class ?? ''}}" value="{{ $val ?? 1}}" {{ $meta ?? '' }}
|
||||
@if ((($value ?? false) == ($val ?? false)) || (!isset($val) && $value)) checked @endif
|
||||
@if ($disabled ?? false) disabled="disabled" @endif
|
||||
>
|
||||
4
resources/views/components/form/radios/icheck.blade.php
Normal file
4
resources/views/components/form/radios/icheck.blade.php
Normal file
@@ -0,0 +1,4 @@
|
||||
<div class="icheck-{{ $color ?? 'success' }} {{ $class ?? '' }}">
|
||||
@include('components.form.radio')
|
||||
<label class="control-label light" for="{{ $id_name ?? $id ?? $name }}">{{ $label ?? '' }}</label>
|
||||
</div>
|
||||
Reference in New Issue
Block a user