merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from bagisto/master 

Update
This commit is contained in:
Truong Ngoc Au 2020-07-31 17:27:09 +07:00 committed by GitHub
parent 96e6d35760 4afc0a5883
commit 52277bfbcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -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']);

10
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -167,9 +167,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>
@ -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) {