From 15af64eb3b247b523917f003c9d27a61e8972030 Mon Sep 17 00:00:00 2001
From: Ed <ed@404.blue>
Date: Sat, 24 Dec 2022 16:36:36 +0100
Subject: [PATCH] Bug fixes in the welcome page

---
 tpl/welcome.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tpl/welcome.html b/tpl/welcome.html
index e171b54..f09bab5 100644
--- a/tpl/welcome.html
+++ b/tpl/welcome.html
@@ -27,9 +27,10 @@
 					<td>{{order.data['total']}}€ by {{'Credit card' if order.data['payment_provider'] == 'stripe' else 'Bank Transfer'}}</td>
 				</tr>
 			</table>
-			{% if order.status == 'paid' %}
+			{% if order.status == 'paid' and order.room_confirmed %}
 				<p style="text-align:right;"><a href="/manage/download_ticket?name=BEYOND-{{order.code}}.pdf" role="button">Download ticket</a></p>
-			{% else %}
+			{% endif %}
+			{% if order.status != 'paid' %}
 				<a href="{{order.url}}"><button>Payment area</button></a>
 			{% endif %}	
 		</section>
@@ -163,6 +164,7 @@
 			<h2>Badge</h2>
 			{% if (not order.ans('propic')) or (order.ans('is_fursuiter') != 'No' and not order.ans('propic_fursuiter')) %}
 				<p class="notice">⚠️ One or more badge pictures are missing! This will cause you badge to be empty, so make sure to upload something before the deadline!</p>
+				<p class="notice">⚠️ Photos must be suitable for any audience. Any inappropriate pictures will be removed by the staff</p>
 			{% endif %}
 			<form method="POST" enctype="multipart/form-data" action="/manage/propic/upload">
 				<div class="grid" style="text-align:center;margin-bottom:1em;">
@@ -193,7 +195,9 @@
 					{% if order.ans('propic_fursuiter') %}
 						<input type="submit" name="submit" value="Delete fursuit image" />
 					{% endif %}
-					<input type="submit" value="Upload" />
+					{% if (not order.ans('propic')) or (order.ans('is_fursuiter') != 'No' and not order.ans('propic_fursuiter')) %}
+						<input type="submit" value="Upload" />
+					{% endif %}
 				</div>
 			</form>
 		</section>