From 970d05c1c46ea3cfe1d8f1e87d6daa7b05dc4d61 Mon Sep 17 00:00:00 2001
From: Mohd Faiz <mohdfaiz.dev@gmail.com>
Date: Mon, 3 Feb 2020 12:22:04 +0530
Subject: [PATCH 1/2] Fixed issue 2225

---
 .../Webkul/Admin/src/Resources/views/export/export.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
index 56e8aed08..7136f93d2 100644
--- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="export-form-template">
-    <form method="POST" action="{{ route('admin.datagrid.export') }}" @submit.prevent="onSubmit">
+    <form method="POST" action="{{ route('admin.datagrid.export', ['locale' => request()->get('locale')]) }}" @submit.prevent="onSubmit">
 
         <div class="page-content">
             <div class="form-container">

From b4f4fc5529541bf2219f072c9af99c3c905e6b13 Mon Sep 17 00:00:00 2001
From: Jitendra Singh <jitendra@webkul.com>
Date: Mon, 3 Feb 2020 13:14:11 +0530
Subject: [PATCH 2/2] Issue #2182 fixed

---
 .../Webkul/Admin/src/Resources/views/customers/edit.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a168ed918..33f26415c 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -57,7 +57,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" value="{{ $customer->gender }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customers.customers.gender') }}&quot;">
+                                <select name="gender" class="control" value="{{ $customer->gender }}" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.customers.customers.gender') }}&quot;">
                                     <option value="" {{ $customer->gender == "" ? 'selected' : '' }}></option>
                                     <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>