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

fix

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-12-22 12:10:44 +01:00
parent d72dfa5b6b
commit b4d8bab385
5 changed files with 134 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
resources/views/Shop/Customers/partials/registration.blade.php
View File

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

78
resources/views/Shop/Customers/partials/registration_old.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>

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

@@ -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" class="gradient-green1 rounded-lg"> <x-layout.collapse id="adresses" title="Adresses" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
@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" class="gradient-green1 rounded-lg"> <x-layout.collapse id="delivery_mode" title="Mode de livraison" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries') @include('Shop.Orders.partials.deliveries')
</x-layout.collapse> </x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="gradient-green1 rounded-lg"> <x-layout.collapse id="payment" title="Paiement" class="gradient-green1 rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments') @include('Shop.Orders.partials.payments')
</x-layout.collapse> </x-layout.collapse>
</div> </div>

2
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -10,6 +10,6 @@
</div> </div>
@endforeach @endforeach
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le rensiegner dans le champs ci-contre Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs ci-contre
<textarea name="comment" class="form-control"></textarea> <textarea name="comment" class="form-control"></textarea>

4
resources/views/components/layout/collapse.blade.php
View File

@@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="{{ ($collapse_right ?? false) ? 'col-6' : 'col-12' }}"> <div class="{{ ($collapse_right ?? false) ? 'col-6' : 'col-12' }}">
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#{{ $id }}" aria-expanded="false" aria-controls="{{ $id }}"> <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#{{ $id }}" aria-expanded="false" aria-controls="{{ $id }}">
<i class="fa {{ ($collapsed ?? true) ? 'fa-chevron-right' : 'fa-chevron-down' }}"></i> <i class="fa {{ ($uncollapsed ?? false) ? 'fa-chevron-down' : 'fa-chevron-right' }}"></i>
</button> </button>
{!! $title ?? null !!} {!! $title ?? null !!}
@if (isset($required) && $required) @if (isset($required) && $required)
@@ -21,7 +21,7 @@
@endif @endif
</div> </div>
</div> </div>
<div id="{{ $id }}" class="card-body collapse {{ ($collapsed ?? true) ? '' : 'show' }} {{ $class_body ?? '' }}"> <div id="{{ $id }}" class="card-body collapse {{ ($uncollapsed ?? false) ? 'show' : '' }} {{ $class_body ?? '' }}">
{{ $slot }} {{ $slot }}
</div> </div>
</div> </div>