Prevent mobile receiving actions for batch which is complete or executed
This commit is contained in:
Lance Edgar
parent
af0eea76e2
commit
72b2510681
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,80 +48,82 @@
|
|||
% endfor
|
||||
% endif
|
||||
|
||||
<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>
|
||||
<td>${h.link_to("8", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("9", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("4", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("5", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("6", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("1", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("2", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("3", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("0", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to(".", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("Del", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
% 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>
|
||||
<td>${h.link_to("8", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("9", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("4", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("5", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("6", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("1", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("2", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("3", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>${h.link_to("0", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to(".", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
<td>${h.link_to("Del", '#', class_='keypad-button ui-btn ui-btn-inline ui-corner-all')}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</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">
|
||||
<button type="button" class="ui-btn-active receiving-quantity">1</button>
|
||||
<button type="button" disabled="disabled"> </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>
|
||||
<%
|
||||
uom = 'CS'
|
||||
if row.units_ordered and not row.cases_ordered:
|
||||
uom = 'EA'
|
||||
%>
|
||||
<fieldset data-role="controlgroup" data-type="horizontal">
|
||||
<button type="button" class="ui-btn-active receiving-quantity">1</button>
|
||||
<button type="button" disabled="disabled"> </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>
|
||||
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset data-role="controlgroup" data-type="horizontal">
|
||||
${h.radio('mode', value='received', label="received", checked=True)}
|
||||
${h.radio('mode', value='damaged', label="damaged")}
|
||||
${h.radio('mode', value='expired', label="expired")}
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset data-role="controlgroup" data-type="horizontal" class="receiving-actions">
|
||||
<button type="button" data-action="add" class="ui-btn-inline ui-corner-all">Add</button>
|
||||
<button type="button" data-action="subtract" class="ui-btn-inline ui-corner-all">Subtract</button>
|
||||
## <button type="button" data-action="clear" class="ui-btn-inline ui-corner-all ui-state-disabled">Clear</button>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset data-role="controlgroup" data-type="horizontal">
|
||||
${h.radio('mode', value='received', label="received", checked=True)}
|
||||
${h.radio('mode', value='damaged', label="damaged")}
|
||||
${h.radio('mode', value='expired', label="expired")}
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<fieldset data-role="controlgroup" data-type="horizontal" class="receiving-actions">
|
||||
<button type="button" data-action="add" class="ui-btn-inline ui-corner-all">Add</button>
|
||||
<button type="button" data-action="subtract" class="ui-btn-inline ui-corner-all">Subtract</button>
|
||||
## <button type="button" data-action="clear" class="ui-btn-inline ui-corner-all ui-state-disabled">Clear</button>
|
||||
</fieldset>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<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 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>
|
||||
|
||||
${h.end_form()}
|
||||
${h.end_form()}
|
||||
% endif
|
||||
|
|
|
|||
|
|
@ -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)\
|
||||
|
|
|
|||
Loading…
Reference in a new issue