From 2e6d7aff959ddcc41502b471d6cbf25c97f33834 Mon Sep 17 00:00:00 2001
From: Jitendra Singh <jitendra@webkul.com>
Date: Tue, 28 Jan 2020 18:01:10 +0530
Subject: [PATCH] Issue #2182 fixed

---
 packages/Webkul/Admin/src/Resources/lang/ar/app.php             | 1 +
 packages/Webkul/Admin/src/Resources/lang/en/app.php             | 1 +
 packages/Webkul/Admin/src/Resources/lang/fa/app.php             | 1 +
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php          | 1 +
 .../src/Resources/views/customers/addresses/edit.blade.php      | 2 +-
 .../Webkul/Admin/src/Resources/views/customers/create.blade.php | 1 +
 .../Webkul/Admin/src/Resources/views/customers/edit.blade.php   | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index d4f1757c6..0287d9194 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -760,6 +760,7 @@ return [
             'state' => 'State',
             'select-state' => 'اختر منطقة أو ولاية أو مقاطعة.',
             'country' => 'Country',
+            'other' => 'Other',
             'male' => 'Male',
             'female' => 'Female',
             'phone' => 'Phone',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index ff7a99a15..f5bb73734 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -917,6 +917,7 @@ return [
             'state' => 'State',
             'select-state' => 'Select a region, state or province.',
             'country' => 'Country',
+            'other' => 'Other',
             'male' => 'Male',
             'female' => 'Female',
             'phone' => 'Phone',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index a2e52bd85..8a0eb3992 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -802,6 +802,7 @@ return [
             'state' => 'استان',
             'select-state' => 'یک منطقه ، ایالت یا استان را انتخاب کنید.',
             'country' => 'کشور',
+            'other' => 'Other',
             'male' => 'مرد',
             'female' => 'زن',
             'group-default' => 'نمی توان گروه پیش فرض را حذف کرد.',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index f0a80dc49..5c11fd620 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -791,6 +791,7 @@ return [
             'state' => 'Estado',
             'select-state' => 'Selecione uma região, estado ou província.',
             'country' => 'País',
+            'other' => 'Other',
             'male' => 'Masculino',
             'female' => 'Feminino',
             'phone' => 'Telefone',
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
index 4cc97b69f..f24e08c81 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/addresses/edit.blade.php
@@ -55,7 +55,7 @@
                                 <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                             </div>
 
-                            @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
+                            @include ('admin::customers.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
 
                             <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                                 <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
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 30f976987..7299e3213 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@@ -52,6 +52,7 @@
                     <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="Other">{{ __('admin::app.customers.customers.other') }}</option>
                             <option value="Male">{{ __('admin::app.customers.customers.male') }}</option>
                             <option value="Female">{{ __('admin::app.customers.customers.female') }}</option>
                         </select>
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 5d396d1d0..3f31e783a 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -58,6 +58,7 @@
                             <div class="control-group">
                                 <label for="gender" class="required">{{ __('admin::app.customers.customers.gender') }}</label>
                                 <select name="gender" class="control" value="{{ $customer->gender }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
+                                    <option value="Other" {{ $customer->gender == "Other" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.other') }}</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>