From 07f341306fa8208426229c8e75595e32f7a7bac7 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Wed, 29 Dec 2021 17:52:38 +0530
Subject: [PATCH] Address Field Fixed

---
 .../Customer/src/Http/Controllers/AddressController.php    | 4 ++--
 .../Customer/src/Http/Requests/CustomerAddressRequest.php  | 7 +++++++
 .../views/shop/customers/account/address/create.blade.php  | 2 +-
 .../views/shop/customers/account/address/edit.blade.php    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index d3395e961..8ff6d45c4 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -74,7 +74,7 @@ class AddressController extends Controller
      */
     public function store(CustomerAddressRequest $request)
     {
-        $data = $request->validated();
+        $data = $request->all();
 
         $data['customer_id'] = $this->customer->id;
         $data['address1'] = implode(PHP_EOL, array_filter(request()->input('address1')));
@@ -123,7 +123,7 @@ class AddressController extends Controller
      */
     public function update($id, CustomerAddressRequest $request)
     {
-        $data = $request->validated();
+        $data = $request->all();
 
         $data['address1'] = implode(PHP_EOL, array_filter(request()->input('address1')));
 
diff --git a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
index 3e1a5001a..7c81028e3 100644
--- a/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
+++ b/packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
@@ -40,4 +40,11 @@ class CustomerAddressRequest extends FormRequest
             'vat_id'       => [new VatIdRule()],
         ];
     }
+
+    public function attributes()
+    {
+        return [
+            'address1.*' => 'address',
+        ];
+    }
 }
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index 95bafb4cc..22281fcc1 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -72,7 +72,7 @@
 
                     <input type="text" class="control" name="address1[]" id="address_0" value="{{ $addresses[0] ?: '' }}" 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[]')" v-text="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/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index ebb11c9f6..9ddedf66c 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -72,7 +72,7 @@
 
                 <input type="text" class="control" name="address1[]" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" id="address_0" 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[]')" v-text="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)