Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] POS wildcard search for customers, items

Browse Source
This commit is contained in:
Rohit Waghchaure 2016-10-05 13:38:02 +05:30
parent 9501b38e8b
commit 163e3598c7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/page/pos/pos.js
View File

@ -359,11 +359,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
get_customers: function(key){ get_customers: function(key){
var me = this; var me = this;
key = key.toLowerCase().trim() key = key.toLowerCase().trim()
var re = new RegExp('%', 'g');
var reg = new RegExp(key.replace(re, '\\w*\\s*[a-zA-Z0-9]*'))
if(key){ if(key){
return $.grep(this.customers, function(data) { return $.grep(this.customers, function(data) {
if(data.name.toLowerCase().match(key) if(reg.test(data.name.toLowerCase())
|| data.customer_name.toLowerCase().match(key) || reg.test(data.customer_name.toLowerCase())
|| (data.customer_group && data.customer_group.toLowerCase().match(key))){ || (data.customer_group && reg.test(data.customer_group.toLowerCase()))){
return data return data
} }
}) })
@ -431,7 +434,9 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
}) })
} }
key = this.search.$input.val().toLowerCase(); key = this.search.$input.val().toLowerCase();
var re = new RegExp('%', 'g');
var reg = new RegExp(key.replace(re, '\\w*\\s*[a-zA-Z0-9]*'))
search_status = true search_status = true
if(key){ if(key){
@ -447,8 +452,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
} else if(item.barcode == me.search.$input.val()) { } else if(item.barcode == me.search.$input.val()) {
search_status = false; search_status = false;
return item.barcode == me.search.$input.val(); return item.barcode == me.search.$input.val();
} else if((item.item_code.toLowerCase().match(key)) || } else if(reg.test(item.item_code.toLowerCase()) || reg.test(item.description.toLowerCase()) ||
(item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) { reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase()) ){
return true return true
} }
} }