Add the new 3DSv2 fields

counter/admin.py

@@ -46,6 +46,7 @@ class CustomerAdmin(SearchModelAdmin):
 @admin.register(BillingInfo)
 class BillingInfoAdmin(admin.ModelAdmin):
     list_display = ("first_name", "last_name", "address_1", "city", "country")
+    autocomplete_fields = ("customer",)
 
 
 @admin.register(Counter)

counter/forms.py

@@ -26,6 +26,7 @@ class BillingInfoForm(forms.ModelForm):
             "zip_code",
             "city",
             "country",
+            "phone_number",
         ]
 
 

counter/migrations/0023_billinginfo_phone_number.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.16 on 2024-09-26 10:28
+
+import phonenumber_field.modelfields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("counter", "0022_alter_product_icon"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="billinginfo",
+            name="phone_number",
+            field=phonenumber_field.modelfields.PhoneNumberField(
+                max_length=128, null=True, region=None, verbose_name="Phone number"
+            ),
+        ),
+    ]

counter/models.py

@@ -34,6 +34,7 @@ from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
+from phonenumber_field.modelfields import PhoneNumberField
 
 from accounting.models import CurrencyField
 from club.models import Club
@@ -176,6 +177,14 @@ class BillingInfo(models.Model):
     city = models.CharField(_("City"), max_length=50)
     country = CountryField(blank_label=_("Country"))
 
+    # This table was created during the A22 semester.
+    # However, later on, CA asked for the phone number to be added to the billing info.
+    # As the table was already created, this new field had to be nullable,
+    # even tough it is required by the bank and shouldn't be null.
+    # If one day there is no null phone number remaining,
+    # please make the field non-nullable.
+    phone_number = PhoneNumberField(_("Phone number"), null=True, blank=False)
+
     def __str__(self):
         return f"{self.first_name} {self.last_name}"
 
@@ -192,6 +201,8 @@ class BillingInfo(models.Model):
                 "ZipCode": self.zip_code,
                 "City": self.city,
                 "CountryCode": self.country.numeric,  # ISO-3166-1 numeric code
+                "MobilePhone": self.phone_number.as_national.replace(" ", ""),
+                "CountryCodeMobilePhone": f"+{self.phone_number.country_code}",
             }
         }
         if self.address_2:

counter/tests/test_counter.py

@@ -315,6 +315,7 @@ class TestBillingInfo:
             "zip_code": "34301",
             "city": "Sète",
             "country": "FR",
+            "phone_number": "0612345678",
         }
 
     def test_edit_infos(self, client: Client, payload: dict):
@@ -356,7 +357,7 @@ class TestBillingInfo:
         for key, val in payload.items():
             assert getattr(infos, key) == val
 
-    def test_invalid_data(self, client: Client, payload):
+    def test_invalid_data(self, client: Client, payload: dict[str, str]):
         user = subscriber_user.make()
         client.force_login(user)
         # address_1, zip_code and country are missing
@@ -391,6 +392,42 @@ class TestBillingInfo:
         )
         assert response.status_code == expected_code
 
+    @pytest.mark.parametrize(
+        "phone_number",
+        ["+33612345678", "0612345678", "06 12 34 56 78", "06-12-34-56-78"],
+    )
+    def test_phone_number_format(
+        self, client: Client, payload: dict, phone_number: str
+    ):
+        """Test that various formats of phone numbers are accepted."""
+        user = subscriber_user.make()
+        client.force_login(user)
+        payload["phone_number"] = phone_number
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert infos.phone_number == "0612345678"
+        assert infos.phone_number.country_code == 33
+
+    def test_foreign_phone_number(self, client: Client, payload: dict):
+        """Test that a foreign phone number is accepted."""
+        user = subscriber_user.make()
+        client.force_login(user)
+        payload["phone_number"] = "+49612345678"
+        response = client.put(
+            reverse("api:put_billing_info", args=[user.id]),
+            json.dumps(payload),
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        infos = BillingInfo.objects.get(customer__user=user)
+        assert infos.phone_number.as_national == "06123 45678"
+        assert infos.phone_number.country_code == 49
+
 
 class TestBarmanConnection(TestCase):
     @classmethod