From b298a3973ac320a69ee5146915ab32388f4b95b7 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 14 Dec 2018 15:26:01 +0530
Subject: [PATCH] validation in shipping & payment methods and issue #308 &
 #295

---
 .../Controllers/Customer/CustomerController.php  |  6 ++++--
 .../Webkul/Admin/src/Resources/lang/en/app.php   |  4 +++-
 .../views/configuration/field-type.blade.php     | 16 +++++++---------
 .../Resources/views/customers/create.blade.php   |  9 +++++----
 .../src/Resources/views/customers/edit.blade.php |  9 +++++----
 packages/Webkul/Core/src/Core.php                |  2 +-
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index e8fc2b3c2..c455f1749 100644
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -104,7 +104,8 @@ class CustomerController extends Controller
             'last_name' => 'string|required',
             'gender' => 'required',
             'phone' => 'nullable|numeric|unique:customers,phone',
-            'email' => 'required|unique:customers,email'
+            'email' => 'required|unique:customers,email',
+            'date_of_birth' => 'date|before:today'
         ]);
 
         $data=request()->all();
@@ -152,7 +153,8 @@ class CustomerController extends Controller
             'last_name' => 'string|required',
             'gender' => 'required',
             'phone' => 'nullable|numeric|unique:customers,phone,'. $id,
-            'email' => 'required|unique:customers,email,'. $id
+            'email' => 'required|unique:customers,email,'. $id,
+            'date_of_birth' => 'date|before:today'
         ]);
 
         $this->customer->update(request()->all(),$id);
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 19a77ab37..360244dd0 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -544,7 +544,9 @@ return [
             'channel_name' => 'Channel Name',
             'state' => 'State',
             'select-state' => 'Select a region, state or province.',
-            'country' => 'Country'
+            'country' => 'Country',
+            'male' => 'Male',
+            'female' => 'Female'
         ],
         'reviews' => [
             'title' => 'Reviews',
diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index ba86a3c91..bb32a82ff 100644
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -8,8 +8,6 @@
 
     $validations = implode('|', array_filter($validations));
 
-    $data = config('carriers.flatrate.title');
-
     $key = $item['key'];
     $key = explode(".", $key);
     array_shift($key);
@@ -46,23 +44,23 @@
 
     @if ($field['type'] == 'text')
 
-        <input type="text" v-validate="'{{ $validations }}'" class="control" id="{{ $name }}" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" value="{{ old($name) ?: core()->getConfigData($name) }}" data-vv-as="&quot;{{ $field['name'] }}&quot;">
+        <input type="text" v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" value="{{ old($name) ?: core()->getConfigData($name) }}" data-vv-as="&quot;{{ $field['name'] }}&quot;">
 
     @elseif ($field['type'] == 'textarea')
 
-        <textarea v-validate="'{{ $validations }}'" class="control" id="{{ $name }}" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" data-vv-as="&quot;{{ $field['name'] }}&quot;">{{ old($name) ?: core()->getConfigData($name) }}</textarea>
+        <textarea v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" data-vv-as="&quot;{{ $field['name'] }}&quot;">{{ old($name) ?: core()->getConfigData($name) }}</textarea>
 
     @elseif ($field['type'] == 'select')
 
-        <select v-validate="'{{ $validations }}'" class="control" id="{{ $name }}" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" data-vv-as="&quot;{{ $field['name'] }}&quot;" >
+        <select v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]" data-vv-as="&quot;{{ $field['name'] }}&quot;" >
 
             @foreach($field['options'] as $option)
 
                 <?php
-                    if($option['value']) {
-                        $value = 1;
-                    }else {
+                    if($option['value'] == false) {
                         $value = 0;
+                    }else {
+                        $value = $option['value'];
                     }
 
                     $selectedOption = core()->getConfigData($name) ?? '';
@@ -77,5 +75,5 @@
 
     @endif
 
-    <span class="control-error" v-if="errors.has('{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]')">@{{ errors.first('{!! $name !!}') }}</span>
+    <span class="control-error" v-if="errors.has('{{ $firstField }}[{{ $secondField }}][{{ $field['name'] }}]')">@{{ errors.first('{!! $firstField !!}[{!! $secondField !!}][{!! $field['name'] !!}]') }}</span>
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
index e0eab85f4..37a94826d 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@@ -50,15 +50,16 @@
                     <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
                         <label for="gender" class="required">{{ __('admin::app.customers.customers.gender') }}</label>
                         <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
-                            <option value="Male">Male</option>
-                            <option value="Female">Female</option>
+                            <option value="Male">{{ __('admin::app.customers.customers.male') }}</option>
+                            <option value="Female">{{ __('admin::app.customers.customers.female') }}</option>
                         </select>
                         <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
                     </div>
 
-                    <div class="control-group">
+                    <div class="control-group" :class="[errors.has('date_of_birth') ? 'has-error' : '']">
                         <label for="dob">{{ __('admin::app.customers.customers.date_of_birth') }}</label>
-                        <input type="date" class="control" name="date_of_birth">
+                        <input type="date" class="control" name="date_of_birth" v-validate="" value="{{ old('date_of_birth') }}"  data-vv-as="&quot;{{ __('admin::app.customers.customers.date_of_birth') }}&quot;">
+                        <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
                     </div>
 
                     <div class="control-group">
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index 0b2e48418..781341826 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -53,15 +53,16 @@
                             <div class="control-group">
                                 <label for="gender" class="required">{{ __('admin::app.customers.customers.gender') }}</label>
                                 <select name="gender" class="control" v-validate="'gender'" value="{{ $customer->gender }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
-                                        <option value="Male">Male</option>
-                                        <option value="Female">Female</option>
+                                        <option value="Male" {{ $customer->gender == "Male" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.male') }}</option>
+                                        <option value="Female" {{ $customer->gender == "Female" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.female') }}</option>
                                 </select>
                                 <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
                             </div>
 
-                            <div class="control-group">
+                            <div class="control-group" :class="[errors.has('date_of_birth') ? 'has-error' : '']">
                                 <label for="dob">{{ __('admin::app.customers.customers.date_of_birth') }}</label>
-                                <input type="date" class="control" name="date_of_birth" value="{{ $customer->date_of_birth }}">
+                                <input type="date" class="control" name="date_of_birth" value="{{ $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('admin::app.customers.customers.date_of_birth') }}&quot;">
+                                <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
                             </div>
 
                             <div class="control-group">
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index f4c3ee1cb..0e694b17d 100644
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -525,7 +525,7 @@ class Core
             }
             else {
                 $coreConfigValue = $this->coreConfigRepository->findOneWhere([
-                    'code' => $field,
+                    'code' => $field
                 ]);
             }
         }