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

Let custom inventory batch view override logic for mobile UPC scanning

Browse source
This commit is contained in:
Lance Edgar 2018-01-23 19:00:33 -06:00
parent eefc3b33d7
commit 04d1e303be
2 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tailbone/templates/mobile/batch/inventory/view_row.mako
View file

@ -11,6 +11,9 @@
if row.cases: if row.cases:
uom = 'CS' uom = 'CS'
elif row.units: elif row.units:
if row.product and row.product.weighed:
uom = 'LB'
else:
uom = 'EA' uom = 'EA'
elif row.case_quantity: elif row.case_quantity:
uom = 'CS' uom = 'CS'

41
tailbone/views/inventory.py
View file

@ -27,6 +27,7 @@ Views for inventory batches
from __future__ import unicode_literals, absolute_import from __future__ import unicode_literals, absolute_import
import re import re
import decimal
import six import six
@ -239,7 +240,22 @@ class InventoryBatchView(BatchMasterView):
if upc: if upc:
if len(upc) <= 14: if len(upc) <= 14:
row = self.add_row_for_upc(batch, upc)
if not row:
self.request.session.flash("Product not found: {}".format(upc), 'error')
return self.redirect(self.get_action_url('view', batch, mobile=True))
else:
self.request.session.flash("UPC has too many digits ({}): {}".format(len(upc), upc), 'error')
return self.redirect(self.get_action_url('view', batch, mobile=True))
self.Session.flush()
return self.redirect(self.mobile_row_route_url('view', uuid=row.batch_uuid, row_uuid=row.uuid))
def add_row_for_upc(self, batch, upc):
"""
Add a row to the batch for the given UPC, if applicable.
"""
# try to locate general product by UPC; add to batch either way # try to locate general product by UPC; add to batch either way
provided = GPC(upc, calc_check_digit=False) provided = GPC(upc, calc_check_digit=False)
checked = GPC(upc, calc_check_digit='upc') checked = GPC(upc, calc_check_digit='upc')
@ -255,17 +271,7 @@ class InventoryBatchView(BatchMasterView):
row.upc = provided # TODO: why not 'checked' instead? how to choose? row.upc = provided # TODO: why not 'checked' instead? how to choose?
row.description = "(unknown product)" row.description = "(unknown product)"
self.handler.add_row(batch, row) self.handler.add_row(batch, row)
return row
else:
self.request.session.flash("Product not found: {}".format(upc), 'error')
return self.redirect(self.get_action_url('view', batch, mobile=True))
else:
self.request.session.flash("UPC has too many digits ({}): {}".format(len(upc), upc), 'error')
return self.redirect(self.get_action_url('view', batch, mobile=True))
self.Session.flush()
return self.redirect(self.mobile_row_route_url('view', uuid=row.batch_uuid, row_uuid=row.uuid))
def template_kwargs_view_row(self, **kwargs): def template_kwargs_view_row(self, **kwargs):
row = kwargs['instance'] row = kwargs['instance']
@ -425,12 +431,21 @@ class ValidBatchRow(forms.validators.ModelValidator):
return row return row
class Decimal(fe.validators.Number):
def _to_python(self, value, state):
try:
return decimal.Decimal(value)
except ValueError:
raise Invalid(self.message('number', state), value, state)
class InventoryForm(forms.Schema): class InventoryForm(forms.Schema):
allow_extra_fields = True allow_extra_fields = True
filter_extra_fields = True filter_extra_fields = True
row = ValidBatchRow() row = ValidBatchRow()
cases = fe.validators.Number() cases = Decimal()
units = fe.validators.Number() units = Decimal()
def includeme(config): def includeme(config):