From e3f5541774aa85289ea5ee92c51d5077b085c57e Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 26 Apr 2022 13:47:15 +0200
Subject: [PATCH] Add new "other" payment type

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 .../migrations/0006_auto_20220426_1346.py     | 21 ++++++++++++++++++
 .../migrations/0003_alter_payment_type.py     | 18 +++++++++++++++
 apps/registration/models.py                   |  1 +
 locale/fr/LC_MESSAGES/django.po               | 22 +++++++++++--------
 4 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 apps/participation/migrations/0006_auto_20220426_1346.py
 create mode 100644 apps/registration/migrations/0003_alter_payment_type.py

diff --git a/apps/participation/migrations/0006_auto_20220426_1346.py b/apps/participation/migrations/0006_auto_20220426_1346.py
new file mode 100644
index 0000000..ed6d315
--- /dev/null
+++ b/apps/participation/migrations/0006_auto_20220426_1346.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-04-26 11:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('participation', '0005_pool_results_available'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='solution',
+            options={'ordering': ('participation__team__trigram', 'final_solution', 'problem'), 'verbose_name': 'solution', 'verbose_name_plural': 'solutions'},
+        ),
+        migrations.AlterModelOptions(
+            name='synthesis',
+            options={'ordering': ('passage__pool__round', 'type'), 'verbose_name': 'synthesis', 'verbose_name_plural': 'syntheses'},
+        ),
+    ]
diff --git a/apps/registration/migrations/0003_alter_payment_type.py b/apps/registration/migrations/0003_alter_payment_type.py
new file mode 100644
index 0000000..7def9e0
--- /dev/null
+++ b/apps/registration/migrations/0003_alter_payment_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-04-26 11:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('registration', '0002_participantregistration_health_issues'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payment',
+            name='type',
+            field=models.CharField(blank=True, choices=[('', 'No payment'), ('helloasso', 'Hello Asso'), ('scholarship', 'Scholarship'), ('bank_transfer', 'Bank transfer'), ('other', 'Other (please indicate)'), ('free', 'The tournament is free')], default='', max_length=16, verbose_name='type'),
+        ),
+    ]
diff --git a/apps/registration/models.py b/apps/registration/models.py
index 91da4b6..d5fd812 100644
--- a/apps/registration/models.py
+++ b/apps/registration/models.py
@@ -333,6 +333,7 @@ class Payment(models.Model):
             ('helloasso', "Hello Asso"),
             ('scholarship', _("Scholarship")),
             ('bank_transfer', _("Bank transfer")),
+            ('other', _("Other (please indicate)")),
             ('free', _("The tournament is free")),
         ],
         blank=True,
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 0d8f298..0ecc0eb 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TFJM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-22 18:01+0200\n"
+"POT-Creation-Date: 2022-04-26 13:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yohann D'ANELLO <yohann.danello@animath.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,7 +100,7 @@ msgid "Changelog of type \"{action}\" for model {model} at {timestamp}"
 msgstr "Changelog de type \"{action}\" pour le modèle {model} le {timestamp}"
 
 #: apps/participation/admin.py:19 apps/participation/models.py:314
-#: apps/participation/tables.py:44 apps/registration/models.py:358
+#: apps/participation/tables.py:44 apps/registration/models.py:359
 msgid "valid"
 msgstr "valide"
 
@@ -1326,35 +1326,39 @@ msgid "Bank transfer"
 msgstr "Virement bancaire"
 
 #: apps/registration/models.py:336
+msgid "Other (please indicate)"
+msgstr "Autre (veuillez spécifier)"
+
+#: apps/registration/models.py:337
 msgid "The tournament is free"
 msgstr "Le tournoi est gratuit"
 
-#: apps/registration/models.py:343
+#: apps/registration/models.py:344
 msgid "scholarship file"
 msgstr "Notification de bourse"
 
-#: apps/registration/models.py:344
+#: apps/registration/models.py:345
 msgid "only if you have a scholarship."
 msgstr "Nécessaire seulement si vous déclarez être boursier."
 
-#: apps/registration/models.py:351
+#: apps/registration/models.py:352
 msgid "additional information"
 msgstr "informations additionnelles"
 
-#: apps/registration/models.py:352
+#: apps/registration/models.py:353
 msgid "To help us to find your payment."
 msgstr "Pour nous aider à retrouver votre paiement, si nécessaire."
 
-#: apps/registration/models.py:367
+#: apps/registration/models.py:368
 #, python-brace-format
 msgid "Payment of {registration}"
 msgstr "Paiement de {registration}"
 
-#: apps/registration/models.py:370
+#: apps/registration/models.py:371
 msgid "payment"
 msgstr "paiement"
 
-#: apps/registration/models.py:371
+#: apps/registration/models.py:372
 msgid "payments"
 msgstr "paiements"