Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Take into account price of options

Browse source
This commit is contained in:
Midgard 2020-02-24 00:42:24 +01:00
parent 1025ade758
commit 13560b04cd
Signed by: midgard
GPG key ID: 511C112F1331BBB4
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/views/order.py
View file

@ -105,11 +105,6 @@ def order_edit(order_id: int) -> typing.Union[str, Response]:
return render_template("order_edit.html", form=orderForm, return render_template("order_edit.html", form=orderForm,
order_id=order_id) order_id=order_id)
def _name(option):
try:
return option.name
except AttributeError:
return ", ".join(o.name for o in option)
@order_bp.route("/<order_id>/create", methods=["GET", "POST"]) @order_bp.route("/<order_id>/create", methods=["GET", "POST"])
def order_item_create(order_id: int) -> typing.Any: def order_item_create(order_id: int) -> typing.Any:
@ -167,13 +162,28 @@ def order_item_create(order_id: int) -> typing.Any:
else: else:
session["anon_name"] = item.name session["anon_name"] = item.name
# XXX Temporary # XXX Temporary until OrderItemChoice is used
def _name(option):
try:
return option.name
except AttributeError:
return ", ".join(o.name for o in option)
comments = [_name(option) for option in chosen if option] comments = [_name(option) for option in chosen if option]
if item.comment: if item.comment:
comments.append("Comment: " + item.comment) comments.append("Comment: " + item.comment)
item.comment = "; ".join(comments) item.comment = "; ".join(comments)
item.update_from_hlds() item.update_from_hlds()
# XXX Temporary until OrderItemChoice is used. Move this price calculation to update_from_hlds
# when in OrderItemChoice is in place.
def _price(option):
try:
return option.price or 0
except AttributeError:
return sum(o.price or 0 for o in option)
item.price += sum(_price(option) for option in chosen)
db.session.add(item) db.session.add(item)
db.session.commit() db.session.commit()
flash("Ordered %s" % (item.dish_name), "success") flash("Ordered %s" % (item.dish_name), "success")