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

Prevent mobile receiving actions for batch which is complete or executed

Browse source
This commit is contained in:
Lance Edgar 2017-07-11 10:45:05 -05:00
parent af0eea76e2
commit 72b2510681
3 changed files with 88 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tailbone/templates/mobile/receiving/view.mako
View file

@ -6,8 +6,10 @@
${form.render()|n}
<br />
${h.text('upc-search', class_='receiving-upc-search', placeholder="Enter UPC", autocomplete='off', **{'data-type': 'search', 'data-url': url('mobile.receiving.lookup', uuid=batch.uuid)})}
<br />
% if not instance.executed and not instance.complete:
${h.text('upc-search', class_='receiving-upc-search', placeholder="Enter UPC", autocomplete='off', **{'data-type': 'search', 'data-url': url('mobile.receiving.lookup', uuid=batch.uuid)})}
<br />
% endif
${grid.render_complete()|n}

36
tailbone/templates/mobile/receiving/view_row.mako
View file

@ -48,7 +48,8 @@
% endfor
% endif
<table id="receiving-quantity-keypad-thingy" data-changed="false">
% if not instance.batch.executed and not instance.batch.complete:
<table id="receiving-quantity-keypad-thingy" data-changed="false">
<tbody>
<tr>
<td>${h.link_to("7", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
@ -71,28 +72,28 @@
<td>${h.link_to("Del", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
</tr>
</tbody>
</table>
</table>
${h.form(request.current_route_url(), class_='receiving-update')}
${h.csrf_token(request)}
${h.hidden('row', value=row.uuid)}
${h.hidden('cases')}
${h.hidden('units')}
${h.hidden('expiration_date')}
${h.form(request.current_route_url(), class_='receiving-update')}
${h.csrf_token(request)}
${h.hidden('row', value=row.uuid)}
${h.hidden('cases')}
${h.hidden('units')}
${h.hidden('expiration_date')}
<%
<%
uom = 'CS'
if row.units_ordered and not row.cases_ordered:
uom = 'EA'
%>
<fieldset data-role="controlgroup" data-type="horizontal">
%>
<fieldset data-role="controlgroup" data-type="horizontal">
<button type="button" class="ui-btn-active receiving-quantity">1</button>
<button type="button" disabled="disabled">&nbsp;</button>
${h.radio('receiving-uom', value='CS', checked=uom == 'CS', label="CS")}
${h.radio('receiving-uom', value=unit_uom, checked=uom == unit_uom, label=unit_uom)}
</fieldset>
</fieldset>
<table>
<table>
<tbody>
<tr>
<td>
@ -113,15 +114,16 @@ ${h.hidden('expiration_date')}
</td>
</tr>
</tbody>
</table>
</table>
<div data-role="popup" id="popup-receiving-expiration" data-dismissible="false" data-overlay-theme="b" class="ui-corner-all">
<div data-role="popup" id="popup-receiving-expiration" data-dismissible="false" data-overlay-theme="b" class="ui-corner-all">
<div style="padding:10px 20px;">
<h3>Please provide expiration date</h3>
<input name="expiration-date" type="date" value="" placeholder="Expiration Date" />
<a href="#" class="ui-btn ui-btn-inline ui-corner-all" data-rel="back">Cancel</a>
<button type="button" class="ui-btn ui-btn-inline ui-corner-all">Submit</button>
</div>
</div>
</div>
${h.end_form()}
${h.end_form()}
% endif

10
tailbone/views/purchasing/receiving.py
View file

@ -208,7 +208,17 @@ class ReceivingBatchView(PurchasingBatchView):
fs.configure(include=[
fs.vendor.with_renderer(fa.TextFieldRenderer),
fs.department.with_renderer(fa.TextFieldRenderer),
fs.complete,
fs.executed,
fs.executed_by,
])
batch = fs.model
if not batch.executed:
del [fs.executed, fs.executed_by]
if not batch.complete:
del fs.complete
else:
del fs.complete
def get_mobile_row_data(self, batch):
return super(ReceivingBatchView, self).get_mobile_row_data(batch)\