From a15ded74b5837ce5c29ff8b1d58e33c15484dc91 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Oct 2019 17:16:42 +0530
Subject: [PATCH 1/3] Removed accordian from customer profile view

---
 .../customers/account/profile/index.blade.php | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index ac99ec05d..8389fe924 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -65,40 +65,36 @@
                     @endif --}}
                 </tbody>
             </table>
+
+
+            <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
+                {{ __('shop::app.customer.account.address.index.delete') }}
+            </button>
+
+            <form method="POST" action="{{ route('customer.profile.destroy') }}" @submit.prevent="onSubmit">
+                @csrf
+
+                <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
+                    <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}</h3>
+
+                    <div slot="body">
+                        <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
+                            <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
+                            <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
+                            <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                        </div>
+
+                        <div class="page-action">
+                            <button type="submit"  class="btn btn-lg btn-primary mt-10">
+                            {{ __('shop::app.customer.account.address.index.delete') }}
+                            </button>
+                        </div>
+                    </div>
+                </modal>
+            </form>
         </div>
 
-        <accordian :title="'{{ __('shop::app.customer.account.profile.index.title') }}'" :active="true">
-            <div slot="body">
-                <div class="page-action">
-                    <button type="submit" @click="showModal('deleteProfile')" class="btn btn-lg btn-primary mt-10">
-                        {{ __('shop::app.customer.account.address.index.delete') }}
-                    </button>
-                </div>
-
-                <form method="POST" action="{{ route('customer.profile.destroy') }}" @submit.prevent="onSubmit">
-                    @csrf
-                    <modal id="deleteProfile" :is-open="modalIds.deleteProfile">
-                        <h3 slot="header">{{ __('shop::app.customer.account.address.index.enter-password') }}</h3>
-
-                        <div slot="body">
-                            <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
-                                <label for="password" class="required">{{ __('admin::app.users.users.password') }}</label>
-                                <input type="password" v-validate="'required|min:6|max:18'" class="control" id="password" name="password" data-vv-as="&quot;{{ __('admin::app.users.users.password') }}&quot;"/>
-                                <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
-                            </div>
-
-                            <div class="page-action">
-                                <button type="submit"  class="btn btn-lg btn-primary mt-10">
-                                {{ __('shop::app.customer.account.address.index.delete') }}
-                                </button>
-                            </div>
-                        </div>
-                    </modal>
-                </form>
-            </div>
-        </accordian>
-
-         {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
+        {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
     </div>
 </div>
 @endsection

From 334074d0dfb80bea028f4da9b78c959a6bc9b8d0 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Oct 2019 17:21:40 +0530
Subject: [PATCH 2/3] Datagrrid action cloumn with issue fixed

---
 packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
index f21ac7108..47b8aa529 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
@@ -39,7 +39,7 @@
                 @endforeach
 
                 @if ($enableActions)
-                    <td class="actions" style="width: 100px;" data-value="{{ __('ui::app.datagrid.actions') }}">
+                    <td class="actions" style="white-space: nowrap; width: 100px;" data-value="{{ __('ui::app.datagrid.actions') }}">
                         <div class="action">
                             @foreach ($actions as $action)
                                 @php

From 00deebd3fd62faf14cf7c3334ba0d9a831a03bba Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 31 Oct 2019 17:36:41 +0530
Subject: [PATCH 3/3] Issue #1644 fixed

---
 packages/Webkul/Product/src/Repositories/ProductRepository.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index da41cf916..f1b00ee80 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -182,6 +182,9 @@ class ProductRepository extends Repository
 
                                     $query2 = $query2->where(function($query3) use($aliasTemp, $column, $temp) {
                                         foreach($temp as $code => $filterValue) {
+                                            if (! is_numeric($filterValue))
+                                                continue;
+
                                             $columns = $aliasTemp . '.' . $column;
                                             $query3 = $query3->orwhereRaw("find_in_set($filterValue, $columns)");
                                         }