From 6565f25153496e5d8d58dabe299dfb97a61a88e0 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 31 Jan 2020 13:18:40 +0530
Subject: [PATCH 1/2] Issue #2182

---
 .../Admin/src/Resources/views/customers/create.blade.php       | 3 ++-
 .../Webkul/Admin/src/Resources/views/customers/edit.blade.php  | 3 ++-
 .../Resources/views/promotions/catalog-rules/edit.blade.php    | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

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 7299e3213..cf465aa88 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
@@ -51,7 +51,8 @@
 
                     <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;">
+                        <select name="gender" class="control" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.customers.customers.gender') }}&quot;">
+                            <option value=""></option>
                             <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>
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 3f31e783a..a168ed918 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -55,9 +55,10 @@
                                 <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
                             </div>
 
-                            <div class="control-group">
+                            <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;">
+                                    <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>
                                     <option value="Female" {{ $customer->gender == "Female" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.female') }}</option>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
index 44de76283..841d5d574 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
@@ -519,8 +519,6 @@
                         this.condition.value = this.condition.value == '' && this.condition.value != undefined ? [] : [ this.condition.value ];
                     }
 
-                    console.log(this.condition.value);
-
                     return matchedAttribute[0];
                 }
             },

From 7fdf5b66ab6861e7c68e0be0e6e9eac3852c0306 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 31 Jan 2020 13:31:38 +0530
Subject: [PATCH 2/2] Issue #2173

---
 packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php | 9 ++++++++-
 packages/Webkul/Admin/src/Resources/lang/ar/app.php     | 4 +++-
 packages/Webkul/Admin/src/Resources/lang/en/app.php     | 4 +++-
 packages/Webkul/Admin/src/Resources/lang/fa/app.php     | 4 +++-
 packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php  | 4 +++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
index 3a779b910..59f13d130 100755
--- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
@@ -59,7 +59,14 @@ class LocalesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'filterable' => true
+            'filterable' => true,
+            'closure' => true,
+            'wrapper' => function ($value) {
+                if ($value->direction == 'ltr')
+                    return trans('admin::app.datagrid.ltr');
+                else
+                    return trans('admin::app.datagrid.rtl');
+            }
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 0287d9194..f08c39d6e 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -150,7 +150,9 @@ return [
         'role' => 'الدور',
         'sub-total' => 'المجموع الفرعي',
         'no-of-products' => 'عدد المنتجات',
-        'refunded' => 'Refunded'
+        'refunded' => 'Refunded',
+        'rtl' => 'RTL',
+        'ltr' => 'LTR',
     ],
 
     'account' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index f99d7b842..e745bfc5c 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -213,7 +213,9 @@ return [
         'times-used' => 'Times Used',
         'created-date' => 'Created Date',
         'expiration-date' => 'Expiration Date',
-        'delete' => 'Delete'
+        'delete' => 'Delete',
+        'rtl' => 'RTL',
+        'ltr' => 'LTR',
     ],
 
     'account' => [
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index 8a0eb3992..db6b8c70a 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -167,7 +167,9 @@ return [
         'disc_quantity' => 'مقدار استفاده نشده',
         'disc_threshold' => 'آستانه استفاده نشده',
         'use_coupon' => 'استافده از کوپن',
-        'refunded' => 'Refunded'
+        'refunded' => 'Refunded',
+        'rtl' => 'RTL',
+        'ltr' => 'LTR',
     ],
 
     'account' => [
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 5c11fd620..d1d98d358 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -155,7 +155,9 @@ return [
         'per-cust' => 'Por cliente',
         'usage-throttle' => 'Tempos de uso',
         'for-guest' => 'Para convidados',
-        'refunded' => 'Refunded'
+        'refunded' => 'Refunded',
+        'rtl' => 'RTL',
+        'ltr' => 'LTR',
     ],
     'account' => [
         'title' => 'Minha Conta',