Merge branch 'f-klubben:next' into next

requirements.txt

@@ -1,9 +1,9 @@
-Django==4.2.13
+Django==4.1.13
 Pillow==10.3.0
 Coverage==7.5.1
 pytz==2024.1
 freezegun==1.5.1
 Django-Select2==8.1.2
 django-debug-toolbar==4.3.0
-requests==2.31.0
+requests==2.32.0
 qrcode==7.4.2

stregsystem/mail.py

@@ -50,6 +50,11 @@ def send_userdata_mail(member):
     mobilepayments: list[MobilePayment] = member.mobilepayment_set.order_by("timestamp")
     mobilepay_payments: list[Payment] = [mobilepayment.payment for mobilepayment in mobilepayments]
 
+    if member.gender in [i for (i, _) in member.GENDER_CHOICES]:
+        gender = [text for (i, text) in member.GENDER_CHOICES if member.gender == i][0]
+    else:
+        gender = member.gender
+
     sales_csv = rows_to_csv(
         [["Timestamp", "Name", "Price"]] + [[sale.timestamp, sale.product.name, sale.price] for sale in sales]
     )
@@ -59,8 +64,32 @@ def send_userdata_mail(member):
     )
     userdata_csv = rows_to_csv(
         [
-            ["Id", "Name", "First name", "Last name", "Email", "Registration year"],
-            [member.id, member.username, member.firstname, member.lastname, member.email, member.year],
+            [
+                "Id",
+                "Name",
+                "First name",
+                "Last name",
+                "Email",
+                "Registration year",
+                "Active",
+                "Gender",
+                "Want spam",
+                "Balance",
+                "Undo count",
+            ],
+            [
+                member.id,
+                member.username,
+                member.firstname,
+                member.lastname,
+                member.email,
+                member.year,
+                member.active,
+                gender,
+                member.want_spam,
+                member.balance,
+                member.undo_count,
+            ],
         ]
     )