From 163e3598c7c43c964615adc0b958e22f6721a18b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 5 Oct 2016 13:38:02 +0530 Subject: [PATCH 1/2] [Fix] POS wildcard search for customers, items --- erpnext/accounts/page/pos/pos.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index fa884816526..a5ce9858607 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -359,11 +359,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ get_customers: function(key){ var me = this; key = key.toLowerCase().trim() + var re = new RegExp('%', 'g'); + var reg = new RegExp(key.replace(re, '\\w*\\s*[a-zA-Z0-9]*')) + if(key){ return $.grep(this.customers, function(data) { - if(data.name.toLowerCase().match(key) - || data.customer_name.toLowerCase().match(key) - || (data.customer_group && data.customer_group.toLowerCase().match(key))){ + if(reg.test(data.name.toLowerCase()) + || reg.test(data.customer_name.toLowerCase()) + || (data.customer_group && reg.test(data.customer_group.toLowerCase()))){ 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 if(key){ @@ -447,8 +452,8 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ } else if(item.barcode == me.search.$input.val()) { search_status = false; return item.barcode == me.search.$input.val(); - } else if((item.item_code.toLowerCase().match(key)) || - (item.item_name.toLowerCase().match(key)) || (item.item_group.toLowerCase().match(key))) { + } else if(reg.test(item.item_code.toLowerCase()) || reg.test(item.description.toLowerCase()) || + reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase()) ){ return true } } From e86eaf543cec46ef72dc5a9cfe03c95592e98a3e Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 5 Oct 2016 14:45:15 +0530 Subject: [PATCH 2/2] removed sync master data onload of the pos page --- erpnext/accounts/page/pos/pos.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index a5ce9858607..668b377fda6 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -15,13 +15,11 @@ frappe.pages['pos'].refresh = function(wrapper) { window.onbeforeunload = function () { return wrapper.pos.beforeunload() } - wrapper.pos.on_refresh_page() } erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ init: function(wrapper){ - this.load = true; this.page = wrapper.page; this.wrapper = $(wrapper).find('.page-content'); this.set_indicator(); @@ -31,17 +29,6 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.si_docs = this.get_doc_from_localstorage(); }, - on_refresh_page: function() { - var me = this; - if(this.load){ - this.load = false; - }else if(this.connection_status){ - this.onload(); - }else{ - this.create_new(); - } - }, - beforeunload: function(e){ if(this.connection_status == false && frappe.get_route()[0] == "pos"){ e = e || window.event;