From a03befbf445657686123a2152c104be1e3161cc4 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Thu, 22 Dec 2022 12:10:44 +0100
Subject: [PATCH] fix

---
 .../Customers/partials/registration.blade.php | 90 ++++++++++---------
 .../partials/registration_old.blade.php       | 78 ++++++++++++++++
 resources/views/Shop/Orders/order.blade.php   |  6 +-
 .../Shop/Orders/partials/deliveries.blade.php |  2 +-
 .../components/layout/collapse.blade.php      |  4 +-
 5 files changed, 134 insertions(+), 46 deletions(-)
 create mode 100644 resources/views/Shop/Customers/partials/registration_old.blade.php

diff --git a/resources/views/Shop/Customers/partials/registration.blade.php b/resources/views/Shop/Customers/partials/registration.blade.php
index 06c283b1..463d43fb 100644
--- a/resources/views/Shop/Customers/partials/registration.blade.php
+++ b/resources/views/Shop/Customers/partials/registration.blade.php
@@ -1,78 +1,88 @@
 <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>
+        @include('components.form.input', [
+            'name' => 'first_name',
+            'value' => $customer['first_name'] ?? '',
+            'label' => 'Prénom',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'last_name',
+            'value' => $customer['last_name'] ?? '',
+            'label' => 'Nom',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'company',
+            'value' => $customer['company'] ?? '',
+            'label' => 'Société',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'tva',
+            'value' => $customer['tva'] ?? '',
+            'label' => 'N° de TVA',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'email',
+            'value' => $customer['email'] ?? '',
+            'label' => 'Email',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'phone',
+            'value' => $customer['phone'] ?? '',
+            'label' => 'Téléphone',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'address',
+            'value' => $customer['address'] ?? '',
+            'label' => 'Adresse de facturation',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'address2',
+            'value' => $customer['address2'] ?? '',
+            'label' => 'Complément d\'adresse',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'zipcode',
+            'value' => $customer['zipcode'] ?? '',
+            'label' => 'Code postal',
+        ])
     </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>
+        @include('components.form.input', [
+            'name' => 'city',
+            'value' => $customer['city'] ?? '',
+            'label' => 'Ville',
+        ])
     </div>
 </div>
 
diff --git a/resources/views/Shop/Customers/partials/registration_old.blade.php b/resources/views/Shop/Customers/partials/registration_old.blade.php
new file mode 100644
index 00000000..06c283b1
--- /dev/null
+++ b/resources/views/Shop/Customers/partials/registration_old.blade.php
@@ -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>
+
diff --git a/resources/views/Shop/Orders/order.blade.php b/resources/views/Shop/Orders/order.blade.php
index a8ed6c5f..21aab310 100644
--- a/resources/views/Shop/Orders/order.blade.php
+++ b/resources/views/Shop/Orders/order.blade.php
@@ -23,15 +23,15 @@
 			{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
 
 				<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')
 					</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')
 					</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')
 					</x-layout.collapse>
 				</div>
diff --git a/resources/views/Shop/Orders/partials/deliveries.blade.php b/resources/views/Shop/Orders/partials/deliveries.blade.php
index 0cbd4abc..b9de5081 100644
--- a/resources/views/Shop/Orders/partials/deliveries.blade.php
+++ b/resources/views/Shop/Orders/partials/deliveries.blade.php
@@ -10,6 +10,6 @@
     </div>
 @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>
\ No newline at end of file
diff --git a/resources/views/components/layout/collapse.blade.php b/resources/views/components/layout/collapse.blade.php
index 670ad055..1cd2416b 100644
--- a/resources/views/components/layout/collapse.blade.php
+++ b/resources/views/components/layout/collapse.blade.php
@@ -3,7 +3,7 @@
 		<div class="row">
 			<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 }}">
-					<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>
 				{!! $title ?? null !!} 
 				@if (isset($required) && $required)
@@ -21,7 +21,7 @@
 			@endif
 		</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 }}
 	</div>
 </div>