Merge branch '504-imp-improve-system-emails'

Author: bruecksen

bakeup/shop/models.py

@@ -951,7 +951,7 @@ def replace_message_tags(self, message, request):
                     "first_name": self.customer.user.first_name,
                     "last_name": self.customer.user.last_name,
                     "email": self.customer.user.email,
-                    "order": self.get_order_positions_string(),
+                    "order": self.get_order_positions_string(html=True),
                     "price_total": (
                         self.price_total and Money(self.price_total, "EUR") or ""
                     ),

bakeup/workshop/models.py

@@ -714,7 +714,7 @@ def replace_message_tags(self, message, order, user, client, production_day):
                     "first_name": user.first_name,
                     "last_name": user.last_name,
                     "email": user.email,
-                    "order": SafeString(order.get_order_positions_string()),
+                    "order": SafeString(order.get_order_positions_string(html=True)),
                     "price_total": (
                         order.price_total and Money(order.price_total, "EUR") or ""
                     ),