From 3995b2056ddf07b6b0e2367f14a05c350eb1116a Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Wed, 29 Jul 2020 19:03:10 +0530
Subject: [PATCH 1/3] issue #3531 fixed

---
 .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index 041a23ef3..232536b21 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -99,7 +99,7 @@
 
                                     <li v-if='numberCondition != null'>
                                         <div class="control-group">
-                                            <input type="number" class="control response-number" placeholder="{{ __('ui::app.datagrid.numeric-value-here') }}"  v-model="numberValue"/>
+                                            <input type="text" class="control response-number" v-on:input="filterNumberInput" placeholder="{{ __('ui::app.datagrid.numeric-value-here') }}"  v-model="numberValue"/>
                                         </div>
                                     </li>
 
@@ -292,6 +292,10 @@
                         this.numberCondition = null;
                     },
 
+                    filterNumberInput: function(e){
+                        this.numberValue = e.target.value.replace(/[^0-9\,\.]+/g, '');                            
+                    },
+
                     getResponse: function() {
                         label = '';
 

From ec89568bf6e6e0357dd65e3baf9622540c921875 Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Thu, 30 Jul 2020 12:57:51 +0530
Subject: [PATCH 2/3] fixed above mentioned issue

---
 packages/Webkul/Ui/src/DataGrid/DataGrid.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index 0de51f738..258379854 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -199,6 +199,10 @@ abstract class DataGrid
             unset($parsedUrl['page']);
         }
 
+        if (isset($parsedUrl['grand_total'])) {
+            $parsedUrl['grand_total']['eq'] = str_replace(',', '.', $parsedUrl['grand_total']['eq']);
+        }
+
         $this->itemsPerPage = isset($parsedUrl['perPage']) ? $parsedUrl['perPage']['eq'] : $this->itemsPerPage;
 
         unset($parsedUrl['perPage']);

From 170b6c63e64fa3378999bf475469a2c877c3a18e Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Thu, 30 Jul 2020 14:56:01 +0530
Subject: [PATCH 3/3] getting exception while using filter total column and
 applying other the equals to condition

---
 packages/Webkul/Ui/src/DataGrid/DataGrid.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index 7d15f7b72..dde0da5ef 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -203,7 +203,9 @@ abstract class DataGrid
         }
 
         if (isset($parsedUrl['grand_total'])) {
-            $parsedUrl['grand_total']['eq'] = str_replace(',', '.', $parsedUrl['grand_total']['eq']);
+            foreach ($parsedUrl['grand_total'] as $key => $value) {
+                $parsedUrl['grand_total'][$key] = str_replace(',', '.', $parsedUrl['grand_total'][$key]);
+            }           
         }
 
         $this->itemsPerPage = isset($parsedUrl['perPage']) ? $parsedUrl['perPage']['eq'] : $this->itemsPerPage;