From b3e2e28d8c7323d1977021f49c1b9cc84bbc4482 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 31 Oct 2019 15:52:14 +0100
Subject: [PATCH] wip #3169 @0.5

---
 app/Http/Controllers/AjaxController.php |  9 ++++--
 app/SubForms/FormField.php              |  2 +-
 resources/views/partials/form.blade.php | 38 ++++++++++++++-----------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 67b2f84..3ac817f 100644
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -43,9 +43,12 @@ class AjaxController extends CubistFrontController
             } else {
                 $v[] = 'nullable';
             }
-            if ($field['type'] == 'email') {
+            if ($field['type'] === 'email') {
                 $v[] = 'email';
                 $messages[$field['type'] . '.email'] = __('Adresse e-mail invalide');
+            } else if ($field['type'] === 'phone') {
+                $v[] = 'regex:/^[0-9 \+\.\-\(\)\/]{10,}$/';
+                $messages[$field['type'] . '.regex'] = __('Numéro de téléphone invalide');
             }
             if (count($v)) {
                 $validation[$field['type']] = implode('|', $v);
@@ -143,7 +146,7 @@ class AjaxController extends CubistFrontController
         $ga['add'] = [];
         $ga['remove'] = [];
 
-        $needs_update=false;
+        $needs_update = false;
 
         switch ($request->input('action')) {
             case 'add':
@@ -175,7 +178,7 @@ class AjaxController extends CubistFrontController
                 break;
 
             case 'delete':
-                if(isset($cart_items[$id])) {
+                if (isset($cart_items[$id])) {
                     $ga['remove'][$id] = $cart_items[$id];
                     unset($cart_items[$id]);
                 }
diff --git a/app/SubForms/FormField.php b/app/SubForms/FormField.php
index a69d631..47033e6 100644
--- a/app/SubForms/FormField.php
+++ b/app/SubForms/FormField.php
@@ -14,7 +14,7 @@ class FormField extends SubForm
 
         $this->addField(['name' => 'type',
             'type' => 'SelectFromArray',
-            'options' => ['firstname' => 'Prénom', 'name' => 'Nom', 'company' => 'Société', 'email' => 'Email', 'ref' => 'Référence', 'sku' => 'Numéro de série', 'subject' => 'Sujet', 'message' => 'Message'],
+            'options' => ['firstname' => 'Prénom', 'name' => 'Nom', 'company' => 'Société', 'email' => 'Email', 'ref' => 'Référence', 'sku' => 'Numéro de série', 'subject' => 'Sujet', 'message' => 'Message', 'phone' => 'Téléphone'],
             'label' => 'Type de champ']);
 
         $this->addField(['name' => 'mandatory',
diff --git a/resources/views/partials/form.blade.php b/resources/views/partials/form.blade.php
index 692c10d..baf6041 100644
--- a/resources/views/partials/form.blade.php
+++ b/resources/views/partials/form.blade.php
@@ -34,43 +34,49 @@
                         <label class="form-input">
                             @switch($field['type'])
                                 @case('name')
-                                    {{ __('Nom')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="name">
+                                {{ __('Nom')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="name">
                                 @break
 
                                 @case('firstname')
-                                    {{ __('Prénom')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="firstname">
+                                {{ __('Prénom')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="firstname">
                                 @break
 
                                 @case('company')
-                                    {{ __('Société')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="company">
+                                {{ __('Société')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="company">
+                                @break
+
+                                @case('phone')
+                                {{ __('Téléphone')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="phone">
                                 @break
 
                                 @case('email')
-                                    {{ __('E-mail')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="email" {!! $required !!}  name="email">
+                                {{ __('E-mail')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="email" {!! $required !!}  name="email">
                                 @break
 
                                 @case('ref')
-                                    {{ __('Référence')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="ref">
+                                {{ __('Référence')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="ref">
                                 @break
 
                                 @case('sku')
-                                    {{ __('Numéro de série')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="sku">
+                                {{ __('Numéro de série')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="sku">
                                 @break
 
                                 @case('subject')
-                                    {{ __('Sujet')}}{{ $asx}}
-                                    <input class="py-3 mt-3" type="text" {!! $required !!}  name="subject">
+                                {{ __('Sujet')}}{{ $asx}}
+                                <input class="py-3 mt-3" type="text" {!! $required !!}  name="subject">
                                 @break
 
                                 @case('message')
-                                    {{ __('Message')}}{{ $asx}}
-                                    <textarea class="py-3 textarea mt-3" type="text" {!! $required !!}  name="message"></textarea>
+                                {{ __('Message')}}{{ $asx}}
+                                <textarea class="py-3 textarea mt-3" type="text"
+                                          {!! $required !!}  name="message"></textarea>
                                 @break
                             @endswitch
                         </label>
-- 
2.39.5