diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 6e2bc6350..dde0da5ef 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -202,6 +202,12 @@ abstract class DataGrid unset($parsedUrl['page']); } + if (isset($parsedUrl['grand_total'])) { + 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; unset($parsedUrl['perPage']); 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 d3ffb38ba..845658344 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -167,9 +167,7 @@
  • - +
  • @@ -382,7 +380,11 @@ this.numberCondition = null; }, - getResponse: function () { + filterNumberInput: function(e){ + this.numberValue = e.target.value.replace(/[^0-9\,\.]+/g, ''); + }, + + getResponse: function() { label = ''; for (let colIndex in this.columns) {