rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improved product UPC search so check digit is optional.

Browse source
This commit is contained in:
Lance Edgar 2013-08-17 18:31:26 -07:00
parent 1ade594046
commit d1b2983a9b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rattail/pyramid/views/products.py
View file

@ -46,6 +46,7 @@ from rattail.exceptions import LabelPrintingError
from rattail.db.model import ( from rattail.db.model import (
Product, ProductPrice, ProductCost, ProductCode, Product, ProductPrice, ProductCost, ProductCode,
Brand, Vendor, Department, Subdepartment, LabelProfile) Brand, Vendor, Department, Subdepartment, LabelProfile)
from rattail.gpc import GPC
from rattail.pyramid import Session from rattail.pyramid import Session
from rattail.pyramid.forms import (AutocompleteFieldRenderer, from rattail.pyramid.forms import (AutocompleteFieldRenderer,
@ -97,20 +98,22 @@ class ProductsGrid(SearchableAlchemyGridView):
def filter_upc(): def filter_upc():
def filter_is(q, v): def filter_is(q, v):
if not v:
return q
try: try:
v = int(v) return q.filter(Product.upc.in_((
GPC(v), GPC(v, calc_check_digit='upc'))))
except ValueError: except ValueError:
return q return q
else:
return q.filter(Product.upc == v) if v else q
def filter_not(q, v): def filter_not(q, v):
if not v:
return q
try: try:
v = int(v) return q.filter(~Product.upc.in_((
GPC(v), GPC(v, calc_check_digit='upc'))))
except ValueError: except ValueError:
return q return q
else:
return q.filter(Product.upc != v) if v else q
return {'is': filter_is, 'nt': filter_not} return {'is': filter_is, 'nt': filter_not}