Fix HTML rendering for UOM choice options
also avoid deprecated config methods
This commit is contained in:
parent
d504da19c5
commit
f2915afda4
|
@ -26,7 +26,7 @@
|
||||||
<option v-for="item in ${name}_options"
|
<option v-for="item in ${name}_options"
|
||||||
tal:attributes=":key 'item.value';
|
tal:attributes=":key 'item.value';
|
||||||
:value 'item.value';">
|
:value 'item.value';">
|
||||||
{{ item.label }}
|
<span v-html="item.label"></span>
|
||||||
</option>
|
</option>
|
||||||
|
|
||||||
</b-select>
|
</b-select>
|
||||||
|
|
|
@ -341,7 +341,7 @@ class CustomerOrderView(MasterView):
|
||||||
'allow_contact_info_choice': self.batch_handler.allow_contact_info_choice(),
|
'allow_contact_info_choice': self.batch_handler.allow_contact_info_choice(),
|
||||||
'allow_contact_info_create': self.batch_handler.allow_contact_info_creation(),
|
'allow_contact_info_create': self.batch_handler.allow_contact_info_creation(),
|
||||||
'order_items': items,
|
'order_items': items,
|
||||||
'product_key_label': self.rattail_config.product_key_title(),
|
'product_key_label': app.get_product_key_label(),
|
||||||
'allow_unknown_product': self.batch_handler.allow_unknown_product(),
|
'allow_unknown_product': self.batch_handler.allow_unknown_product(),
|
||||||
'department_options': self.get_department_options(),
|
'department_options': self.get_department_options(),
|
||||||
'default_uom_choices': self.batch_handler.uom_choices_for_product(None),
|
'default_uom_choices': self.batch_handler.uom_choices_for_product(None),
|
||||||
|
@ -767,7 +767,7 @@ class CustomerOrderView(MasterView):
|
||||||
if self.batch_handler.product_price_may_be_questionable():
|
if self.batch_handler.product_price_may_be_questionable():
|
||||||
data['price_needs_confirmation'] = row.price_needs_confirmation
|
data['price_needs_confirmation'] = row.price_needs_confirmation
|
||||||
|
|
||||||
key = self.rattail_config.product_key()
|
key = app.get_product_key_field()
|
||||||
if key == 'upc':
|
if key == 'upc':
|
||||||
data['product_key'] = data['product_upc_pretty']
|
data['product_key'] = data['product_upc_pretty']
|
||||||
elif key == 'item_id':
|
elif key == 'item_id':
|
||||||
|
|
Loading…
Reference in a new issue