Start redesign of order page

app/app.py

@@ -171,6 +171,7 @@ def add_template_filters(app: Flask) -> None:
     app.template_filter("euro")(euro_string)
     app.template_filter("price_range")(price_range_string)
     app.template_filter("any")(any)
+    app.template_filter("all")(all)
 
 
 app = Flask(__name__)

app/models/order.py

@@ -44,35 +44,48 @@ class Order(db.Model):
         ), "location_id must be configured before updating from HLDS"
         self.location_name = self.location.name
 
-    def group_by_user(self) -> typing.Dict[str, typing.Any]:
+    def for_user(self, anon=None, user=None) -> typing.List:
+        return list(
+            filter(
+                (lambda i: i.user == user)
+                if user is not None
+                else (lambda i: i.user_name == anon),
+                self.items
+            )
+        )
+
+    def group_by_user(self) -> typing.List[typing.Tuple[str, typing.List]]:
         "Group items of an Order by user"
-        group: typing.Dict[str, typing.Any] = dict()
+        group: typing.Dict[str, typing.List] = dict()
+
         for item in self.items:
-            user = group.get(item.get_name(), dict())
+            if item.for_name not in group:
-            user["total"] = user.get("total", 0) + item.price
+                group[item.for_name] = []
-            user["to_pay"] = user.get("to_pay", 0) + item.price if not item.paid else 0
-            user["paid"] = user.get("paid", True) and item.paid
-            user["dishes"] = user.get("dishes", []) + [item.dish_name]
-            group[str(item.get_name())] = user
 
-        return group
+            group[item.for_name].append(item)
 
-    def group_by_dish(
+        for _user_name, order_items in group.items():
-        self, sort_comments=False
+            order_items.sort(key=lambda order_item: order_item.comment or "")
-    ) -> typing.Dict[str, typing.Dict[str, typing.Any]]:
+
+        return list(sorted(group.items()))
+
+    def group_by_dish(self) -> typing.List[typing.Tuple[str, typing.List]]:
         "Group items of an Order by dish"
-        group: typing.Dict[str, typing.Dict[str, typing.Any]] = dict()
+        group: typing.Dict[str, typing.List] = dict()
+
         for item in self.items:
-            dish = group.get(item.dish_name, dict())
+            if item.dish_name not in group:
-            dish["count"] = dish.get("count", 0) + 1
+                group[item.dish_name] = []
-            dish["comments"] = dish.get("comments", []) + [item.comment]
-            group[item.dish_name] = dish
 
-        if sort_comments:
+            group[item.dish_name].append(item)
-            for _dish_name, dish_props in group.items():
-                dish_props["comments"].sort()
 
-        return group
+        for _dish_name, order_items in group.items():
+            order_items.sort(key=lambda order_item: (
+                (order_item.comment or "   No comment") +
+                (order_item.for_name)
+            ))
+
+        return list(sorted(group.items()))
 
     def is_closed(self) -> bool:
         return self.stoptime and datetime.now() > self.stoptime

app/models/orderitem.py

@@ -37,7 +37,8 @@ class OrderItem(db.Model):
                 raise ValueError("No Location found with id: " + location_id)
         raise AttributeError()
 
-    def get_name(self) -> str:
+    @property
+    def for_name(self) -> str:
         "Get the name of the user which 'owns' the item"
         if self.user_id is not None and self.user_id > 0:
             return self.user.username
@@ -46,7 +47,7 @@ class OrderItem(db.Model):
     def __repr__(self) -> str:
         return "Order %d: %s wants %s" % (
             self.order_id or 0,
-            self.get_name(),
+            self.for_name,
             self.dish_name or "None",
         )
 

app/static/css/main.css

@@ -1,4 +1,3 @@
-/* Custom CSS */
 :root {
 	/* Darkmode colors */
 	--dGray0: #D0D0D8;
@@ -47,12 +46,6 @@ body {
 	padding-top: 10px;
 }
 
-.darker {
-	background-color: #fafafa;
-	margin-top: 10px;
-	padding-bottom: 5px;
-}
-
 @media (min-width: 992px) {
 	.align-bottom {
 		margin-top: 2.5em;
@@ -121,10 +114,6 @@ body {
 	margin-top: 1.3em;
 }
 
-.order_row {
-	background: var(--dGray4);
-}
-
 .time_data{
 	display: flex;
 	justify-content: space-between;
@@ -144,14 +133,6 @@ body {
 	}
 }
 
-/* Add clickable box */
-div.box:hover {
-	cursor: hand;
-	cursor: pointer;
-	opacity: .9;
-	box-shadow: 2px 4px 4px -1px #888888;
-}
-
 a.divLink {
 	position: absolute;
 	width: 100%;
@@ -199,17 +180,24 @@ a {
 	background-color: var(--dGray6);
 }
 .navbar-default .navbar-nav .active a {
-	background-color: var(--dGray4);
+	background-color: var(--dGray5);
 	color: var(--dGray1);
 }
-.navbar-default .navbar-nav .active a:hover{
+.navbar-default .navbar-nav .active a:hover,
-	background-color: var(--dGray3);
+.navbar-default .navbar-nav .active a:focus,
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+	background-color: var(--dGray4);
 	color: var(--dGray0);
 }
-.navbar-default .navbar-nav li a,.navbar-default .navbar-brand{
+.navbar-default .navbar-nav li a,
+.navbar-default .navbar-brand {
 	color: var(--dGray1);
 }
-.navbar-default .navbar-nav li a:hover,.navbar-default .navbar-brand:hover{
+.navbar-default .navbar-nav li a:hover,
+.navbar-default .navbar-nav li a:focus,
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
 	color: var(--dGray0);
 }
 hr{
@@ -220,9 +208,16 @@ h1, h2, h3, h4, h5, h6{
 	color: var(--dGray1);
 }
 
-.jumbotron, .darker {
+.jumbotron, .darker, .order_row {
-	background-color: var(--dGray4);
+	background: var(--dGray4);
 }
+
+.darker {
+	margin-top: 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+
 .table tbody tr td {
 	border-top: 1px solid var(--dGray3);
 }
@@ -287,9 +282,6 @@ h1, h2, h3, h4, h5, h6{
 .form-control::placeholder{
 	color: var(--dGray2);
 }
-.enter_darkmode>a {
-	text-align: center;
-}
 
 #dish_choices {
 	margin: 0.5em 1em 1.5em;

app/static/css/themes/plain_lightmode.css

@@ -1,10 +1,10 @@
 :root {
-	--dGray0:#444444;
+	--dGray0:#212121;
-	--dGray1:#666666;
+	--dGray1:#444444;
-	--dGray2:#212121;
+	--dGray2:#666666;
-	--dGray3:#ffffff;
+	--dGray3:#cccccc;
-	--dGray4:#f9f9f9;
+	--dGray4:#f1f1f1;
-	--dGray5:#ffffff;
+	--dGray5:#f8f8f8;
 	--dGray6:#ffffff;
 	--dBlue:#0A84FF;
 }

app/templates/order.html

@@ -1,59 +1,100 @@
 {% extends "layout.html" %}
 {% set active_page = "orders" -%}
-{% set order_items = order.group_by_user() -%}
+{% if current_user.is_anonymous() %}
+	{% set my_items = order.for_user(anon=session.get("anon_name", "")) %}
+{% else %}
+	{% set my_items = order.for_user(user=current_user) %}
+{% endif %}
 {% set courier_or_admin = not current_user.is_anonymous() and (current_user.is_admin() or current_user.id == order.courier_id) -%}
 
 {% import "utils.html" as util %}
 
 {% block container %}
-<div class="row">
+<header>
-	<div class="col-md-push-1 col-md-10 darker order_overview" id="info"><!-- Shitty html -->
+	<h2 id="order-title">Order {{ order.id }}</h2>
-		<h3 id="order-title">Order {{ order.id }}
+
-		<div class="pull-right">
+	<div class="location">
+		{% if order.location %}
+			<a href="{{ url_for('general_bp.location', location_id=order.location_id) }}">{{ order.location_name }}</a>
+		{% else %}
+			{{ order.location_name }}
+		{% endif %}
+	</div>
+</header>
+
+<section>
+	<div class="box" id="order_info">
+		<h3>Order information</h3>
+		<dl>
+			<dt>Location</dt>
+			<dd>
+				{% if order.location %}
+					<a href="{{ url_for('general_bp.location', location_id=order.location_id) }}">{{ order.location_name }}</a>
+				{% else %}
+					{{ order.location_name }}
+				{% endif %}
+			</dd>
+
+			<dt>Delivery at</dt>
+			<dd>
+				Zeuskelder <b>TODO</b>
+			</dd>
+
+			<dt>Courier</dt>
+			<dd>
+				{% if order.courier == None %}
+					{% if not current_user.is_anonymous() %}
+					<form action="{{ url_for('order_bp.volunteer', order_id=order.id) }}" method="post" style="display:inline">
+						<input type="submit" class="btn btn-primary btn-sm" value="Volunteer"></input>
+					</form>
+					{% else %}No-one{% endif %}
+				{% else %}
+					{{ order.courier.username }}
+				{% endif %}
+			</dd>
+
+			<br/>
+			<br/>
+			<dt>Opens</dt>
+			<dd>{{ order.starttime.strftime("%d/%m/%Y %H:%M") }}</dd>
+
+			<dt>Closes</dt>
+			<dd>
+				{% if order.stoptime %}
+					{{ order.stoptime.strftime("%H:%M") }} ({{  order.stoptime|countdown }})
+				{% else %}
+					Never
+				{% endif %}
+			</dd>
+		</dl>
+
+		<div>
 			{% if order.can_close(current_user.id) -%}
 				<form action="{{ url_for('order_bp.close_order', order_id=order.id) }}" method="post" style="display:inline">
 					<input type="submit" class="btn btn-danger" value="Close"></input>
 				</form>
-			{% endif %}{% if courier_or_admin %}
+			{% endif %}
-				<a class="btn btn-warning" href="{{ url_for('order_bp.order_edit', order_id=order.id) }}">Edit</a>
+			{% if courier_or_admin %}
+				<a class="btn" href="{{ url_for('order_bp.order_edit', order_id=order.id) }}">Edit</a>
 			{%- endif %}
-		</div></h3>
-		courier: {{ order.courier.username }}
-		{% if order.courier == None and not current_user.is_anonymous() %}
-		<form action="{{ url_for('order_bp.volunteer', order_id=order.id) }}" method="post" style="display:inline">
-			<input type="submit" class="btn btn-primary btn-sm" value="Volunteer"></input>
-		</form>
-		{% endif %}
-		<br/>
-		location: {% if order.location %}
-			<a href="{{ url_for('general_bp.location', location_id=order.location_id) }}">{{ order.location_name }}</a>
-		{% else %}
-			{{ order.location_name }}
-		{% endif %}<br/>
-		{% if order.location.telephone != None %}
-			telephone: <a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a><br/>
-		{% endif %}
-		start: {{ order.starttime.strftime("%d/%m/%Y %H:%M") }}<br>
-		{% if order.stoptime %}
-			closing time: {{ order.stoptime.strftime("%H:%M") }} ({{  order.stoptime|countdown }})
-		{% else %}open{% endif %}<br/>
-		total price: {{ total_price|euro }} {% if courier_or_admin %}- remaining debts: {{ debts|euro }}{% endif %}
 		</div>
-	{% if form -%}
+	</div><!--
-	<div class="col-md-push-1 col-md-10 darker order_order" id="form">
+
-		<h4>Order</h4>
+	-->{% if form %}<!--
+
+	--><div class="box" id="add_item">
+		<h3>Add item to order</h3>
+
 		<form method="post" action="{{ url_for('order_bp.order_item_create', order_id=order.id) }}">
-			<span class="pull-right">
-				<a class="btn btn-primary" onclick="chooseRandom()">Choose for me</a>
-			</span>
 			{{ form.csrf_token }}
+			<input type="hidden" name="form_for_dish" value="{{ dish.id }}" />
+
 			<div class="form-group select2-container select2 {{ 'has-errors' if form.dish_id.errors}}">
-				{{ form.dish_id.label(class='control-label') }}<br>
+				{{ form.dish_id.label }}<br>
 				{{ form.dish_id(class='form-control select') }}
 				{{ util.render_form_field_errors(form.dish_id) }}
 			</div>
 
-			<input type="hidden" name="form_for_dish" value="{{ dish.id }}" />
 			<div id="dish_choices">
 				{% if dish and dish.choices %}
 				{% for (choice_type, choice) in dish.choices %}
@@ -76,7 +117,7 @@
 			</div>
 
 			<div class="form-group {{ 'has-errors' if form.dish_id.errors }}">
-				{{ form.comment.label(class='control-label') }}<br>
+				{{ form.comment.label }}<br>
 				{{ form.comment(class='form-control', placeholder='Fill in comment, when applicable') }}
 				{{ util.render_form_field_errors(form.comment) }}
 			</div>
@@ -89,98 +130,165 @@
 				</div>
 			{% endif %}
 			<div class="form-group" style="padding-top: 8px;">
+				<a class="btn" onclick="chooseRandom();">Random</a>
+
 				{{ form.submit_button(class='btn btn-primary') }}
 				{% if not dish %}
 					<div id="submit-reveals-options-msg">If the chosen dish has options, they will be shown when you press submit, before adding the item to the order.</div>
 				{% endif %}
 			</div>
 		</form>
-	</div>
+	</div><!--
-	{%- endif %}
+
-</div>
+	--><div class="box" id="from_history">
-<div class="row" id="items">
+		<h3>Add from history</h3>
-	<div class="col-md-push-1 col-md-5 darker order_items" id="items-list">
+		<ul>
-		<h3>Items</h3>
+			<li>Todo</li>
-		<table class="table table-hover table-condensed">
+		</ul>
-			<thead>
+	</div><!--
-				<tr><th>Name</th><th>Item</th><th>Price</th>{% if courier_or_admin %}<th>Paid?</th>{% endif %}<th>Delete</th></tr>
+
-			</thead>
+	-->{% endif %}<!--
-			<tbody>
+
-			{% for item in order.items -%}
+	--><div class="box" id="my_items">
-				<tr>
+		<h3>My items</h3>
-					<td>{{ item.get_name() }}</td>
+		{% if my_items %}
-					<td><span title="{{ item.comment if item.comment }}">{{ item.dish_name }}{{ "*" if item.comment }}</span></td>
+			<ul>
-					<td>{{ item.price|euro }}</td>
+				{% for item in my_items %}
-					{% if courier_or_admin %}
+				<li>
-						<td>
-							{% if not item.paid %}
-								<form action="{{ url_for('order_bp.item_paid', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
-									<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
-								</form>
-							{% else %} <span class="glyphicon glyphicon-chevron-down"></span>
-							{% endif %}
-						</td>
-					{% endif %}
-					<td>
 					{% if item.can_delete(order.id, current_user.id, session.get('anon_name', '')) -%}
 						<form action="{{ url_for('order_bp.delete_item', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
-							<button class="btn btn-link" type="submit"><span class="glyphicon glyphicon-remove"></span></button>
+							<button class="btn btn-link btn-sm" type="submit" style="padding: 0 0.5em;"><span class="glyphicon glyphicon-remove"></span></button>
 						</form>
-					{%- endif %}<br/></td>
+					{%- endif %}
-				</tr>
+					<span class="price_aligned">{{ item.price|euro }}</span> {{ item.dish_name }}{% if item.comment %}; {{ item.comment }}{% endif %}
-			{%- endfor %}
+				</li>
-			</tbody>
-		</table>
-	</div>
-	<div class="col-md-push-2 col-md-4 darker box order_ordered" id="items-ordered">
-		<h3>Ordered dishes: {{ order.items.count() }}</h3>
-		<a class="divLink" href="{{ url_for('order_bp.items_showcase', order_id=order.id) }}"></a>
-		{% for key, value in order.group_by_dish().items() -%}
-			<div class="product">
-				{{ key }}: {{ value["count"] }}
-				{% if value["comments"]|any -%}
-					<ul class="comments">
-					{% for comment in value["comments"] -%}
-						<li>{% if comment %}{{ comment }}
-						{% else %}<i>No comment</i>
-						{% endif %}</li>
 				{% endfor %}
 			</ul>
+		{% else %}
+			<div>(None)</div>
+		{% endif %}
+	</div>
+</section>
+
+<section>
+	<div class="box" id="per_dish">
+		<h3>Ordered dishes</h3>
+		{% for dish_name, dish_order_items in order.group_by_dish() -%}
+			{% set has_comments = dish_order_items | map(attribute="comment") | any -%}
+			<div class="dish {{ 'no_comments' if not has_comments }}">
+				<h4>
+					<span class="quantity">{{ dish_order_items | length }}</span> ×
+					{{ dish_name }}
+				</h4>
+
+				{% if has_comments -%}
+					<ul class="comments">
+					{% for item in dish_order_items -%}
+					<li>{% if item["comment"] %}<span>{{ item["comment"] }}</span>
+						{% else %}<i>No comment</i>
+						{% endif %}<span class="spacer"> </span><span class="item_for">for {{ item.for_name }}</span></li>
+					{% endfor %}
+					</ul>
+				{% else %}
+					<span class="spacer"> </span><span class="item_for">for {{ dish_order_items | map(attribute="for_name") | join(", ") }}</span>
 				{%- endif %}
+
+				</p>
 			</div>
 		{%- endfor %}
+		<div class="footer">
+			Total {{ order.items.count() }} items — {{ total_price|euro }}
+			<a class="btn" href="{{ url_for('order_bp.items_showcase', order_id=order.id) }}">Shop view</a>
 		</div>
+	</div><!--
+
+	--><div class="box" id="how_to_order">
+		<h3>Ordering at {{ order.location_name }}</h3>
+		<dl>
+			{% if order.location.telephone %}
+				<dt>Telephone</dt>
+				<dd><a href="tel://{{ order.location.telephone }}">{{ order.location.telephone }}</a></dd>
+			{% endif %}
+
+			{% if order.location.website %}
+				<dt>Website</dt>
+				<dd><a href="{{ order.location.website }}">{{ order.location.website }}</a></dd>
+			{% endif %}
+
+			{% if order.location.address or order.location.osm %}
+				<dt>Location</dt>
+				<dd>
+					{% if order.location.osm %}
+					<a href="{{ order.location.osm }}">{{ order.location.address or "View on OSM" }}</a>
+					{% else %}
+					{{ order.location.address }}
+					{% endif %}
+				</dd>
+			{% endif %}
+		</dl>
+		<b>TODO Only show options that allow you to order</b>
 	</div>
-<div class="row">
+</section>
-	<div class="col-md-push-1 col-md-5 darker order_depts" id="debts">
+
-			<h3>Debts</h3>
+<section class="single_column">
-			<table class="table table-hover table-condensed">
+	<div class="box" id="per_person">
+		<h3>Items per person</h3>
+		<table class="table table-condensed">
 			<thead>
-					<tr><th>Name</th><th>Total</th><th>To pay</th>{% if courier_or_admin %}<th>Paid?</th>{% endif %}</tr>
+				<tr><th>Total</th><th>Name</th><th>Items</th></tr>
 			</thead>
 			<tbody>
-				{% for key, value in order_items.items() -%}
+			{% for user_name, order_items in order.group_by_user() -%}
 				<tr>
-						<td>{{ key }}</td>
-						<td>{{ value["total"]|euro }}</td>
-						<td>{{ value["to_pay"]|euro }}</td>
-						{% if courier_or_admin %}
 					<td>
-								{% if not value["to_pay"] == 0 %}
+						{% set paid = order_items | map(attribute="paid") | all %}
-									<form action="{{ url_for('order_bp.items_user_paid', order_id=order.id, user_name=key) }}" method="post" style="display:inline">
+						<input type="checkbox" name="{{ user_name }}"
-										<input type="submit" class="btn btn-xs btn-primary" value="Pay"></input>
+									  {{ "disabled" if paid }} style="{{ 'opacity: 0.5' if paid }}">
+
+						<span class="price">{{ order_items | map(attribute="price") | sum | euro }}</span>
+
+						{% if paid %}paid{% endif %}
+					</td>
+					<td>{{ user_name }}</td>
+					<td class="items">
+						<ul>
+						{% for item in order_items %}
+							<li class="{{ 'paid' if item.paid }}">
+								<div class="actions">
+								{% if item.can_delete(order.id, current_user.id, session.get('anon_name', '')) -%}
+									<form action="{{ url_for('order_bp.delete_item', order_id=order.id, item_id=item.id) }}" method="post" style="display:inline">
+										<button class="btn btn-link btn-sm" type="submit" style="padding: 0 0.5em;"><span class="glyphicon glyphicon-remove"></span></button>
 									</form>
 								{% else %}
-									<span class="glyphicon glyphicon-chevron-down"></span>
+									<span class="glyphicon glyphicon-remove" style="color: var(--dGray3); padding: 0 0.5em"></span>
-								{% endif %}
+								{%- endif %}
+								</div>
+
+								<div class="price_aligned">{{ item.price|euro }}</div>
+								<div class="item_description">{{ item.dish_name }}{{ "; " + item.comment if item.comment }}</div>
+							</li>
+						{% endfor %}
+							<li>
+								<button class="btn btn-link btn-sm" onclick="alert('TODO')" style="padding: 0 0.5em;"><span class="glyphicon glyphicon-plus"></span></button>
+							</li>
+						</ul>
 					</td>
-						{% endif %}
+
 				</tr>
 			{%- endfor %}
 			</tbody>
 		</table>
+
+		<div class="footer">
+			On selected:
+			<button class="btn btn-sm">Mark paid (TODO)</button>
+
+			Request payment for selected:
+			<button class="btn btn-sm"><span class="glyphicon glyphicon-piggy-bank"></span> Tab (TODO)</button>
+			<button class="btn btn-sm"><span class="glyphicon glyphicon-qrcode"></span> QR code (TODO)</button>
 		</div>
 	</div>
+</section>
 {% endblock %}
 
 {% block styles %}
@@ -188,6 +296,122 @@
 	<link rel="stylesheet" href="{{ url_for('static', filename='css/select2.min.css') }}" />
 	<link rel="stylesheet" href="{{ url_for('static', filename='css/select2-bootstrap.min.css') }}">
 	<link rel="stylesheet" href="{{ url_for('static', filename='css/print.css') }}">
+
+	<style>
+body, h1, h2, h3, h4 {
+	color: var(--dGray0);
+}
+table {
+	overflow-wrap: break-word;
+}
+section {
+	column-count: 2;
+	column-gap: 50px;
+}
+section.single_column {
+	column-count: unset;
+}
+header {
+	margin-bottom: 25px;
+}
+h2 {
+	margin-bottom: 0;
+}
+h3 {
+	margin-top: 0;
+}
+.location {
+	font-size: 125%;
+	font-weight: 500;
+	margin-left: 2px;
+	margin-top: -5px;
+}
+.box {
+	display: inline-block;
+	vertical-align: top;
+	width: 100%;
+	border: 2px solid var(--dGray0);
+	padding: 10px;
+	margin-bottom: 50px;
+}
+
+#order_info dl {
+	column-width: 150px;
+}
+
+#from_history ul, #my_items ul, #per_person ul {
+	list-style-type: none;
+	padding: 0;
+}
+dl {
+	margin-bottom: 10px;
+}
+.box :last-child {
+	margin-bottom: 0;
+}
+
+.box h4 {
+	font-size: 110%;
+	font-weight: bold;
+	margin-bottom: 0.6em;
+}
+
+#per_dish .dish.no_comments {
+	display: flex;
+	align-items: flex-end;
+}
+#per_dish .dish.no_comments h4 {
+	margin-bottom: 0;
+	line-height: inherit;
+}
+#per_dish .comments li {
+	display: flex;
+	align-items: flex-end;
+	line-height: 1.5;
+	margin: 0.3em 0;
+}
+#per_dish .spacer {
+	content: ' ';
+	flex-grow: 1;
+	min-width: 10px;
+	border-bottom: 1px solid var(--dGray3);
+	margin: 0.3em 0.5em;
+}
+#per_dish .item_for {
+	color: var(--dGray2);
+	text-align: right;
+}
+
+
+#per_person li {
+	white-space: nowrap;
+	margin: 0;
+	vertical-align: top;
+}
+#per_person li > * {
+	display: inline-block;
+	vertical-align: top;
+}
+#per_person .item_description {
+	white-space: normal;
+}
+
+.price, .price_aligned {
+	white-space: nowrap;
+}
+.price_aligned {
+	display: inline-block;
+	width: 4em;
+}
+
+.items .paid {
+	opacity: 0.4;
+}
+
+.footer {
+	margin-top: 1em;
+}
+	</style>
 {% endblock %}
 {% block scripts %}
 	{{ super() }}

app/templates/order_items.html

@@ -33,13 +33,13 @@ Haldis - Order {{ order.id }}
 		</div>
 		{% endif %}
 
-		{% for key, value in order.group_by_dish(True).items() -%}
+		{% for dish_name, dish_order_items in order.group_by_dish() -%}
 			<div class="dish">
-				<h2><span class="quantity">{{ value["count"] }}</span> × {{ key }}</h2>
+				<h2><span class="quantity">{{ dish_order_items | length }}</span> × {{ dish_name }}</h2>
-				{% if value["comments"]|any -%}
+				{% if dish_order_items | map(attribute="comment") | any -%}
 					<ul class="comments">
-					{% for comment in value["comments"] -%}
+					{% for item in dish_order_items -%}
-						<li>{% if comment %}{{ comment }}
+						<li>{% if item["comment"] %}{{ item["comment"] }}
 						{% else %}<i>No comment</i>
 						{% endif %}</li>
 					{% endfor %}

app/templates/utils.html

@@ -1,5 +1,5 @@
 {% macro render_order(order) -%}
-<div class="row darke order_row">
+<div class="row order_row">
 	<div class="col-md-8 col-lg-9 order_data">
 		<h5>{{ order.location_name }}</h5>
 		<b class="amount_of_orders">{{ order.items.count() }} orders</b></p>

app/utils.py

@@ -7,7 +7,11 @@ def euro_string(value: int) -> str:
     """
     Convert cents to string formatted euro
     """
-    return "€ {}.{:02}".format(*divmod(value, 100))
+    euro, cents = divmod(value, 100)
+    if cents:
+        return "€ {}.{:02}".format(euro, cents)
+    else:
+        return "€ {}".format(euro)
 
 
 def price_range_string(price_range, include_upper=False):

app/views/order.py

@@ -234,21 +234,6 @@ def order_item_create(order_id: int) -> typing.Any:
     return redirect(url_for("order_bp.order_from_id", order_id=order_id))
 
 
-@order_bp.route("/<order_id>/<item_id>/paid", methods=["POST"])
-@login_required
-# pylint: disable=R1710
-def item_paid(order_id: int, item_id: int) -> typing.Optional[Response]:
-    "Indicate payment status for an item in an order"
-    item = OrderItem.query.filter(OrderItem.id == item_id).first()
-    user_id = current_user.id
-    if item.order.courier_id == user_id or current_user.admin:
-        item.paid = True
-        db.session.commit()
-        flash("Paid %s by %s" % (item.dish_name, item.get_name()), "success")
-        return redirect(url_for("order_bp.order_from_id", order_id=order_id))
-    abort(404)
-
-
 @order_bp.route("/<order_id>/<user_name>/user_paid", methods=["POST"])
 @login_required
 # pylint: disable=R1710
@@ -269,7 +254,7 @@ def items_user_paid(order_id: int, user_name: str) -> typing.Optional[Response]:
         for item in items:
             item.paid = True
         db.session.commit()
-        flash("Paid %d items for %s" % (len(items), item.get_name()), "success")
+        flash("Paid %d items for %s" % (len(items), item.for_name), "success")
         return redirect(url_for("order_bp.order_from_id", order_id=order_id))
     abort(404)