diff --git a/app/views/order.py b/app/views/order.py index 18a8f57..2d66241 100644 --- a/app/views/order.py +++ b/app/views/order.py @@ -215,16 +215,16 @@ def get_orders(expression=None): def post_order_to_webhook(order_item): message = '' if order_item.courrier is not None: - message = '{3} is going to {1}, order <{0}|here>! Deadline in {2} minutes!'.format( + message = ' {3} is going to {1}, order <{0}|here>! Deadline in {2} minutes!'.format( url_for('.order', id=order_item.id, _external=True), order_item.location.name, remaining_minutes(order_item.stoptime), order_item.courrier.username.title()) else: - message = '<{}|Open here.> New order for {}. Deadline in {} minutes.'.format( - url_for('.order', id=order_item.id, _external=True), + message = ' New order for {}. Deadline in {} minutes. <{}|Open here.>'.format( order_item.location.name, - remaining_minutes(order_item.stoptime)) + remaining_minutes(order_item.stoptime), + url_for('.order', id=order_item.id, _external=True)) webhookthread = WebhookSenderThread(message) webhookthread.start() @@ -252,4 +252,4 @@ def remaining_minutes(value): if delta.total_seconds() < 0: return "0" minutes, _ = divmod(delta.total_seconds(), 60) - return "%02d" % minutes \ No newline at end of file + return "%02d" % minutes