diff --git a/app/static/css/main.css b/app/static/css/main.css index 451f630..802364e 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -21,4 +21,35 @@ body { .product .extras { padding-left: 20px; +} + +.showcase .product { + font-size: 16px; +} + +/* Add clickable box */ +div.box:hover { + cursor: hand; + cursor: pointer; + opacity: .9; + /*border-bottom: #f44346 1px solid !important;*/ + box-shadow: 2px 4px 4px -1px #888888; +} + +a.divLink { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + text-decoration: none; + /* Makes sure the link doesn't get underlined */ + z-index: 10; + /* raises anchor tag above everything else in div */ + background-color: white; + /*workaround to make clickable in IE */ + opacity: 0; + /*workaround to make clickable in IE */ + filter: alpha(opacity=0); + /*workaround to make clickable in IE */ } \ No newline at end of file diff --git a/app/templates/order.html b/app/templates/order.html index 13eaa1c..f217afe 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -83,8 +83,9 @@ -
+

Ordered products: {{ order.items.count() }}

+ {% for key, value in order.group_by_product().items() -%}
{{ key }}: {{ value["count"] }} diff --git a/app/templates/order_items.html b/app/templates/order_items.html new file mode 100644 index 0000000..a26fa5b --- /dev/null +++ b/app/templates/order_items.html @@ -0,0 +1,42 @@ +{% extends "bootstrap/base.html" %} +{% import "bootstrap/utils.html" as utils %} + +{% block title %} +Haldis - Order {{ order.id }} +{% endblock %} + +{% block styles %} + {{ super() }} + + +{% endblock %} + +{% block scripts %} + {{ super() }} + +{% endblock %} + +{% block content -%} + {{ utils.flashed_messages(container=True) }} + +
+
+

Ordered products: {{ order.items.count() }}

+ {% for key, value in order.group_by_product().items() -%} +
+

+ {{ key }}: {{ value["count"] }} + {% if value["extras"] -%} +

+ {% for extra in value["extras"] -%} +
{{ extra }}
+ {% endfor %} +
+ {%- endif %} +

+
+ {%- endfor %} +
+
+ +{%- endblock %} \ No newline at end of file diff --git a/app/views/order.py b/app/views/order.py index ad6072d..580ab77 100644 --- a/app/views/order.py +++ b/app/views/order.py @@ -56,6 +56,15 @@ def order(id, form=None): debts = sum([o.product.price for o in order.items if not o.paid]) return render_template('order.html', order=order, form=form, total_price=total_price, debts=debts) +@order_bp.route('//items') +def items_showcase(id, form=None): + order = Order.query.filter(Order.id == id).first() + if order is None: + abort(404) + if current_user.is_anonymous() and not order.public: + flash('Please login to see this order.', 'info') + abort(401) + return render_template('order_items.html', order=order) @order_bp.route('//edit', methods=['GET', 'POST']) @login_required diff --git a/first-setup.sh b/first-setup.sh index 198eca1..466cab4 100755 --- a/first-setup.sh +++ b/first-setup.sh @@ -10,7 +10,7 @@ E="${normal}" if [ ! -d "venv" ]; then echo -e "${B} No venv found, creating a new one ${E}" - python -m venv venv + python3 -m venv venv fi source venv/bin/activate