From a1bda30db1391dfcc6dfa0c64a75e9c281be2f8e Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 29 Dec 2021 18:25:35 +0530
Subject: [PATCH] Changes Done

---
 .../src/Contracts/Validations/Address.php     | 30 +++++++++++++++++++
 .../Webkul/Core/src/Resources/lang/en/app.php |  4 +--
 .../Core/src/Resources/lang/en/validation.php |  9 +++---
 .../Webkul/Core/src/Resources/lang/es/app.php |  4 +--
 .../Core/src/Resources/lang/es/validation.php |  9 +++---
 .../Webkul/Core/src/Resources/lang/fa/app.php |  6 ++--
 .../Core/src/Resources/lang/fa/validation.php |  9 +++---
 .../Webkul/Core/src/Resources/lang/it/app.php |  4 +--
 .../Core/src/Resources/lang/it/validation.php |  9 +++---
 .../Core/src/Resources/lang/pt_BR/app.php     |  4 +--
 .../src/Resources/lang/pt_BR/validation.php   |  9 +++---
 .../Webkul/Core/src/Resources/lang/tr/app.php |  4 +--
 .../Core/src/Resources/lang/tr/validation.php |  9 +++---
 .../Http/Requests/CustomerAddressRequest.php  |  3 +-
 .../account/address/create.blade.php          |  2 +-
 .../customers/account/address/edit.blade.php  |  2 +-
 16 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100755 packages/Webkul/Core/src/Contracts/Validations/Address.php

diff --git a/packages/Webkul/Core/src/Contracts/Validations/Address.php b/packages/Webkul/Core/src/Contracts/Validations/Address.php
new file mode 100755
index 000000000..2bbb4b0c1
--- /dev/null
+++ b/packages/Webkul/Core/src/Contracts/Validations/Address.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Webkul\Core\Contracts\Validations;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class Address implements Rule
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string  $attribute
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return preg_match('/^[a-zA-Z0-9\s\-\,]+$/', $value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return trans('core::validation.address');
+    }
+}
diff --git a/packages/Webkul/Core/src/Resources/lang/en/app.php b/packages/Webkul/Core/src/Resources/lang/en/app.php
index 0755068f0..3585af713 100644
--- a/packages/Webkul/Core/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/en/app.php
@@ -3,6 +3,6 @@
 return [
     'path-hint' => [
         'template' => 'Template',
-        'parents' => 'Parents'
-    ]
+        'parents'  => 'Parents',
+    ],
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/en/validation.php b/packages/Webkul/Core/src/Resources/lang/en/validation.php
index 78fa4fcc9..f2a369d75 100755
--- a/packages/Webkul/Core/src/Resources/lang/en/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/en/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => 'The :attribute must be valid.',
-    'decimal' => 'The :attribute must be valid.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => 'The :attribute must be valid slug.',
+    'code'                => 'The :attribute must be valid.',
+    'decimal'             => 'The :attribute must be valid.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => 'The :attribute must be valid slug.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/es/app.php b/packages/Webkul/Core/src/Resources/lang/es/app.php
index 809f30545..5f9ba77bd 100644
--- a/packages/Webkul/Core/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/es/app.php
@@ -3,6 +3,6 @@
 return [
     'path-hint' => [
         'template' => 'Plantilla',
-        'parents' => 'Padres'
-    ]
+        'parents'  => 'Padres',
+    ],
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/es/validation.php b/packages/Webkul/Core/src/Resources/lang/es/validation.php
index db40e91f0..ea92b6da6 100755
--- a/packages/Webkul/Core/src/Resources/lang/es/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/es/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => 'O :attribute debe ser válido.',
-    'decimal' => 'O :attribute debe ser válido.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => 'O :attribute debe tener un slug válido.',
+    'code'                => 'O :attribute debe ser válido.',
+    'decimal'             => 'O :attribute debe ser válido.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => 'O :attribute debe tener un slug válido.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/fa/app.php b/packages/Webkul/Core/src/Resources/lang/fa/app.php
index da43b37d9..e09c15d7c 100644
--- a/packages/Webkul/Core/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/fa/app.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'slug' => ':attribute باید نامک معتبر داشته باشد.',
-    'code' => ':attribute باید معتبر باشد.',
-    'decimal' => ':attribute باید معتبر باشد.'
+    'slug'    => ':attribute باید نامک معتبر داشته باشد.',
+    'code'    => ':attribute باید معتبر باشد.',
+    'decimal' => ':attribute باید معتبر باشد.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/fa/validation.php b/packages/Webkul/Core/src/Resources/lang/fa/validation.php
index 78fa4fcc9..f2a369d75 100755
--- a/packages/Webkul/Core/src/Resources/lang/fa/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/fa/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => 'The :attribute must be valid.',
-    'decimal' => 'The :attribute must be valid.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => 'The :attribute must be valid slug.',
+    'code'                => 'The :attribute must be valid.',
+    'decimal'             => 'The :attribute must be valid.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => 'The :attribute must be valid slug.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/it/app.php b/packages/Webkul/Core/src/Resources/lang/it/app.php
index 0755068f0..3585af713 100644
--- a/packages/Webkul/Core/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/it/app.php
@@ -3,6 +3,6 @@
 return [
     'path-hint' => [
         'template' => 'Template',
-        'parents' => 'Parents'
-    ]
+        'parents'  => 'Parents',
+    ],
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/it/validation.php b/packages/Webkul/Core/src/Resources/lang/it/validation.php
index abfff6c4c..fea135471 100644
--- a/packages/Webkul/Core/src/Resources/lang/it/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/it/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => ':attribute deve essere valido.',
-    'decimal' => ':attribute deve essere valido.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => ':attribute deve essere uno slug valido.',
+    'code'                => ':attribute deve essere valido.',
+    'decimal'             => ':attribute deve essere valido.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => ':attribute deve essere uno slug valido.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
index 0755068f0..3585af713 100644
--- a/packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
@@ -3,6 +3,6 @@
 return [
     'path-hint' => [
         'template' => 'Template',
-        'parents' => 'Parents'
-    ]
+        'parents'  => 'Parents',
+    ],
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/pt_BR/validation.php b/packages/Webkul/Core/src/Resources/lang/pt_BR/validation.php
index 15407320a..4ab044cd1 100755
--- a/packages/Webkul/Core/src/Resources/lang/pt_BR/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/pt_BR/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => 'O :attribute precisa ser válido.',
-    'decimal' => 'O :attribute precisa ser válido.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => 'O :attribute precisa ter um slug válido.',
+    'code'                => 'O :attribute precisa ser válido.',
+    'decimal'             => 'O :attribute precisa ser válido.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => 'O :attribute precisa ter um slug válido.',
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/tr/app.php b/packages/Webkul/Core/src/Resources/lang/tr/app.php
index 0755068f0..3585af713 100644
--- a/packages/Webkul/Core/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Core/src/Resources/lang/tr/app.php
@@ -3,6 +3,6 @@
 return [
     'path-hint' => [
         'template' => 'Template',
-        'parents' => 'Parents'
-    ]
+        'parents'  => 'Parents',
+    ],
 ];
diff --git a/packages/Webkul/Core/src/Resources/lang/tr/validation.php b/packages/Webkul/Core/src/Resources/lang/tr/validation.php
index c1dde4b28..c5175c1a2 100644
--- a/packages/Webkul/Core/src/Resources/lang/tr/validation.php
+++ b/packages/Webkul/Core/src/Resources/lang/tr/validation.php
@@ -1,9 +1,10 @@
 <?php
 
 return [
+    'address'             => 'The :attribute can only accept alpha, numeric, spaces, comma and dashes.',
     'alpha-numeric-space' => 'The :attribute can only accept alpha, numeric and spaces.',
-    'code' => ':attribute değeri geçerli olmalı.',
-    'decimal' => ':attribute geçerli olmalı.',
-    'phone-number' => 'The :attribute must be valid phone number.',
-    'slug' => ':attribute değeri geçerli bir url olmalı.',
+    'code'                => ':attribute değeri geçerli olmalı.',
+    'decimal'             => ':attribute geçerli olmalı.',
+    'phone-number'        => 'The :attribute must be valid phone number.',
+    'slug'                => ':attribute değeri geçerli bir url olmalı.',
 ];
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
index d0386cb7e..0471ee816 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
@@ -3,6 +3,7 @@
 namespace Webkul\Customer\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Webkul\Core\Contracts\Validations\Address;
 use Webkul\Core\Contracts\Validations\AlphaNumericSpace;
 use Webkul\Core\Contracts\Validations\PhoneNumber;
 use Webkul\Customer\Rules\VatIdRule;
@@ -31,7 +32,7 @@ class CustomerAddressRequest extends FormRequest
             'first_name'   => ['required', new AlphaNumericSpace],
             'last_name'    => ['required', new AlphaNumericSpace],
             'address1'     => ['required', 'array'],
-            'address1.*'   => ['required', new AlphaNumericSpace],
+            'address1.*'   => ['required', new Address],
             'country'      => ['required', 'alpha'],
             'state'        => ['required', 'alpha'],
             'city'         => ['required'],
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index bc3bbd9ab..b55bce2de 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -83,7 +83,7 @@
 
                     <input type="text" class="control" name="address1[]" value="{{ $addresses[0] ?? '' }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
 
-                    <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                    <span class="control-error" v-text="'{{ $errors->first('address1.*') }}'"></span>
                 </div>
 
                 @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 5577dff9a..4d3b61b9c 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -79,7 +79,7 @@
 
                     <input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ $addresses[0] ?? '' }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
 
-                    <span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
+                    <span class="control-error" v-text="'{{ $errors->first('address1.*') }}'"></span>
                 </div>
 
                 @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)