Refactor Order Form a bit to allow custom history data

This commit is contained in:
Lance Edgar 2016-12-29 13:23:21 -06:00
parent feed93eb61
commit 814fd12e9e
2 changed files with 32 additions and 27 deletions

View file

@ -155,14 +155,14 @@
<th>Vend. Code</th>
<th>Pref.</th>
<th>Unit Cost</th>
% for data in history.itervalues():
% for data in history:
<th>
% if data:
% if data['purchase'].date_ordered:
${data['purchase'].date_ordered.strftime('%m/%d') if data else ''}
% elif data['purchase'].date_received:
% if data['purchase']['date_ordered']:
${data['purchase']['date_ordered'].strftime('%m/%d')}
% elif data['purchase']['date_received']:
Rec.<br />
${data['purchase'].date_received.strftime('%m/%d') if data else ''}
${data['purchase']['date_received'].strftime('%m/%d')}
% else:
??
% endif
@ -191,15 +191,15 @@
<td class="code">${cost.code or ''}</td>
<td class="preferred">${'X' if cost.preference == 1 else ''}</td>
<td class="unit-cost">$${'{:0.2f}'.format(cost.unit_cost)}</td>
% for data in history.itervalues():
% for data in history:
<td class="scratch_pad">
% if data:
<% item = data['items'].get(cost.product_uuid) %>
% if item:
% if data['purchase'].date_ordered and (item.cases_ordered is not None or item.units_ordered is not None):
${'{} / {}'.format(int(item.cases_ordered or 0), int(item.units_ordered or 0))}
% elif item.cases_received is not None or item.units_received is not None:
${'{} / {}'.format(int(item.cases_received or 0), int(item.units_received or 0))}
% if data['purchase']['date_ordered'] and (item['cases_ordered'] is not None or item['units_ordered'] is not None):
${'{} / {}'.format(int(item['cases_ordered'] or 0), int(item['units_ordered'] or 0))}
% elif item['cases_received'] is not None or item['units_received'] is not None:
${'{} / {}'.format(int(item['cases_received'] or 0), int(item['units_received'] or 0))}
% endif
% endif
% endif