Issue #595 required_service field

api/locale/fi/LC_MESSAGES/django.po

@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-02 14:59+0000\n"
+"POT-Creation-Date: 2025-11-03 16:06+0200\n"
 "PO-Revision-Date: 2020-12-01 18:28+0200\n"
 "Last-Translator: Sami Olmari <sami@olmari.fi>\n"
 "Language-Team: \n"
@@ -20,82 +20,82 @@ msgstr ""
 "X-Language: fi\n"
 "X-Source-Language: en\n"
 
-#: api/models.py:19
+#: .\api\models.py:19
 msgid "User creation date"
 msgstr "Käyttäjän luontipäivä"
 
-#: api/models.py:20
+#: .\api\models.py:20
 msgid "Automatically set to now when user is create"
 msgstr "Automaattisesti asetettu täksi päiväksi kun käyttäjä on luotu"
 
-#: api/models.py:25
+#: .\api\models.py:25
 msgid "Last modified datetime"
 msgstr "Muokkauspäivä"
 
-#: api/models.py:26
+#: .\api\models.py:26
 msgid "Last time this user was modified"
 msgstr "Päiväys, koska viimeksi muokattu"
 
-#: api/models.py:30
+#: .\api\models.py:30
 msgid "Device name"
 msgstr "Laitteen nimi"
 
-#: api/models.py:31
+#: .\api\models.py:31
 msgid "Human readable name for the device, like door or laser"
 msgstr "Ihmisen luettava nimi laitteelle, kuten ovi tai laser"
 
-#: api/models.py:36
+#: .\api\models.py:36
 msgid "device id"
 msgstr "laitteen tunniste"
 
-#: api/models.py:37
+#: .\api\models.py:37
 msgid "used to know which device this was"
 msgstr "tunnistaa yksittäisen laitteen"
 
-#: api/models.py:50
+#: .\api\models.py:50
 msgid "Date of this entry"
 msgstr "Käytön päivämäärä"
 
-#: api/models.py:51
+#: .\api\models.py:51
 msgid "Automatically set to now when created"
 msgstr "Automaattisesti asetettu täksi päiväksi kun luotu"
 
-#: api/models.py:55
+#: .\api\models.py:55
 msgid "Granted"
 msgstr "Sallittu"
 
-#: api/models.py:55
+#: .\api\models.py:55
 msgid "Was the access granted"
 msgstr "Oliko pääsy sallittu"
 
-#: api/models.py:61
+#: .\api\models.py:61
 msgid "Device this event came from"
 msgstr "Laite, jolta tapahtuma tuli"
 
-#: api/models.py:68
+#: .\api\models.py:68
 msgid "NFC card id or phone number, or other field like that"
 msgstr "NFC-kortti, puhelinnumero, tai vastaava kenttä"
 
-#: api/models.py:75
+#: .\api\models.py:75
 msgid "NFC card"
 msgstr "NFC-kortti"
 
-#: api/models.py:76
+#: .\api\models.py:76
 msgid "NFC card this was mapped to, if any"
 msgstr "NFC-kortti johon tämä mäpättiin, jos sellainen oli"
 
-#: api/models.py:83
+#: .\api\models.py:83
 msgid "Claimed by"
 msgstr "Varaaja"
 
-#: api/models.py:84
+#: .\api\models.py:84
 msgid "Who claimed this entry"
 msgstr "Kuka varasi tämän merkinnän"
 
-#: api/models.py:90
+#: .\api\models.py:90
 msgid "Method"
 msgstr "Tapa"
 
-#: api/models.py:91
+#: .\api\models.py:91
 msgid "Method of device access"
 msgstr "Kirjautumistapa"

drfx/settings.py

@@ -46,7 +46,7 @@
 PRIVACY_POLICY_URL = "https://example.com/privacy_policy.html"
 
 
-# these are for the receipt functionality
+# These are for the receipt functionality
 RECEIPTNAME = "Mulysa ry"
 RECEIPTREGID = "1234567-8"
 RECEIPTSTREET = "Street 12, Somewhere Finland"

emails/locale/fi/LC_MESSAGES/django.po

@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-02 15:39+0000\n"
+"POT-Creation-Date: 2025-11-03 16:06+0200\n"
 "PO-Revision-Date: 2020-09-26 14:09+0300\n"
 "Last-Translator: Sami Olmari <sami@olmari.fi>\n"
 "Language-Team: \n"
@@ -18,64 +18,64 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: emails/admin.py:40
+#: .\emails\admin.py:40
 msgid "Show browser version"
 msgstr "Näytä selaimen versio"
 
-#: emails/admin.py:47 emails/templates/admin/send-email.html:13
+#: .\emails\admin.py:47 .\emails\templates\admin\send-email.html:13
 msgid "Send now"
 msgstr "Lähetä heti"
 
-#: emails/admin.py:85
+#: .\emails\admin.py:85
 msgid "Send email"
 msgstr "Lähetä email"
 
-#: emails/models.py:22 emails/templates/admin/send-email.html:8
+#: .\emails\models.py:22 .\emails\templates\admin\send-email.html:8
 msgid "Subject"
 msgstr "Aihe"
 
-#: emails/models.py:24
+#: .\emails\models.py:24
 msgid ""
 "Descriptive subject for the email. Finnish / English both should be written "
 "here"
 msgstr ""
 "Kuvaava aihe sähköpostille. Sekä suomen- että englanninkieliset versiot "
 "tulisi kirjoittaa tähän"
 
-#: emails/models.py:34
+#: .\emails\models.py:34
 msgid "Content"
 msgstr "Sisältö"
 
-#: emails/models.py:36
+#: .\emails\models.py:36
 msgid ""
 "Content of the email. All emails will start with default 'View this message "
 "in browser' and end with 'You are receiving this message because') texts"
 msgstr ""
 "Sähköpostin sisältö. Kaikki viestit alkavat 'Katsele viestiä selaimessa' ja "
 "loppuvat 'Sait tämän viestin koska' teksteillä"
 
-#: emails/models.py:43
+#: .\emails\models.py:43
 msgid "Creation date"
 msgstr "Luontipäivä"
 
-#: emails/models.py:48
+#: .\emails\models.py:48
 msgid "Last modified datetime"
 msgstr "Muokattu viimeksi päiväys"
 
-#: emails/models.py:52
+#: .\emails\models.py:52
 msgid "Datetime the message was sent"
 msgstr "Viestin lähetyksen päiväys"
 
-#: emails/templates/admin/send-email.html:9
+#: .\emails\templates\admin\send-email.html:9
 msgid "Body"
 msgstr "Sisältö"
 
-#: emails/templates/admin/send-email.html:17
+#: .\emails\templates\admin\send-email.html:17
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: emails/templates/mail_content_and_post.html:5
-#: emails/templates/mail_content_and_post.txt:5
+#: .\emails\templates\mail_content_and_post.html:5
+#: .\emails\templates\mail_content_and_post.txt:5
 #, python-format
 msgid ""
 "You are receiving this email because you are registered member of "

nordigenautomation/locale/fi/LC_MESSAGES/django.po

@@ -2,13 +2,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-08 10:45+0000\n"
+"POT-Creation-Date: 2025-11-03 16:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,73 +18,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nordigenautomation/admin.py:55
+#: .\nordigenautomation\admin.py:55
 msgid "Do requisition"
 msgstr ""
 
-#: nordigenautomation/admin.py:57
+#: .\nordigenautomation\admin.py:57
 msgid ""
 "Initialize requisition, first time will just create a new requisition and "
 "successive clicks will create a new requisition and deprecate all the old "
 "ones"
 msgstr ""
 
-#: nordigenautomation/admin.py:61
+#: .\nordigenautomation\admin.py:61
 msgid "complete settings to get actions"
 msgstr ""
 
-#: nordigenautomation/models.py:59
+#: .\nordigenautomation\models.py:59
 msgid "Nordigen API id"
 msgstr ""
 
-#: nordigenautomation/models.py:64
+#: .\nordigenautomation\models.py:64
 msgid "Nordigen API key"
 msgstr ""
 
-#: nordigenautomation/models.py:69
+#: .\nordigenautomation\models.py:69
 msgid "Nordigen API country"
 msgstr ""
 
-#: nordigenautomation/models.py:75
+#: .\nordigenautomation\models.py:75
 msgid "Nordigen API Institution"
 msgstr ""
 
-#: nordigenautomation/models.py:82
+#: .\nordigenautomation\models.py:82
 msgid "Creation date"
 msgstr ""
 
-#: nordigenautomation/models.py:83
+#: .\nordigenautomation\models.py:83
 msgid "Automatically set to now"
 msgstr ""
 
-#: nordigenautomation/models.py:87
+#: .\nordigenautomation\models.py:87
 msgid "Last modified datetime"
 msgstr ""
 
-#: nordigenautomation/models.py:88
+#: .\nordigenautomation\models.py:88
 msgid "Automatically updated"
 msgstr ""
 
-#: nordigenautomation/models.py:169
+#: .\nordigenautomation\models.py:169
 msgid "Nonce for verification purposes"
 msgstr ""
 
-#: nordigenautomation/models.py:174
+#: .\nordigenautomation\models.py:174
 msgid "Nordigen URL to handle the requisition"
 msgstr ""
 
-#: nordigenautomation/models.py:179
+#: .\nordigenautomation\models.py:179
 msgid "Nordigen Requisition id"
 msgstr ""
 
-#: nordigenautomation/models.py:185
+#: .\nordigenautomation\models.py:185
 msgid "How long this requisition id is valid untill"
 msgstr ""
 
-#: nordigenautomation/models.py:190
+#: .\nordigenautomation\models.py:190
 msgid "Is the requisition valid (user has completed the operation required)"
 msgstr ""
 
-#: nordigenautomation/models.py:195
+#: .\nordigenautomation\models.py:195
 msgid "Deprecated requisition"
 msgstr ""

users/admin.py

@@ -164,7 +164,13 @@ class ServiceSubscriptionAdmin(admin.ModelAdmin):
 
 
 class MemberServiceAdmin(admin.ModelAdmin):
-    list_display = ["name", "cost", "pays_also_service", "accounting_id"]
+    list_display = [
+        "name",
+        "cost",
+        "pays_also_service",
+        "required_service",
+        "accounting_id",
+    ]
 
 
 class AmountDirectionFilter(admin.SimpleListFilter):