Add the new 3DSv2 fields

eboutic/schemas.py

@@ -31,3 +31,8 @@ class BillingInfoSchema(ModelSchema):
             "country",
         ]
         fields_optional = ["customer"]
+
+    # for reasons described in the model, BillingInfo.phone_number
+    # in nullable, but null values shouldn't be actually allowed,
+    # so we force the field to be required
+    phone_number: str

eboutic/templates/eboutic/eboutic_makecommand.jinja

@@ -98,13 +98,20 @@
             </form>
           </div>
           <br>
-          {% if must_fill_billing_infos %}
-            <p>
-              <i>
-                {% trans %}You must fill your billing infos if you want to pay with your credit
-                  card{% endtrans %}
-              </i>
-            </p>
+          {% if billing_infos_state == BillingInfoState.EMPTY %}
+            <div class="alert alert-yellow">
+              {% trans %}You must fill your billing infos if you want to pay with your credit
+                card{% endtrans %}
+            </div>
+          {% elif billing_infos_state == BillingInfoState.MISSING_PHONE_NUMBER %}
+            <div class="alert alert-yellow">
+              {% trans %}
+                The Crédit Agricole changed its policy related to the billing
+                information that must be provided in order to pay with a credit card.
+                If you want to pay with your credit card, you must add a phone number
+                to the data you already provided.
+              {% endtrans %}
+            </div>
           {% endif %}
           <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}" name="bank-pay-form">
             <template x-data x-for="[key, value] in Object.entries($store.billing_inputs.data)">
@@ -113,7 +120,7 @@
             <input
               type="submit"
               id="bank-submit-button"
-              {% if must_fill_billing_infos %}disabled="disabled"{% endif %}
+              {% if billing_infos_state != BillingInfoState.VALID %}disabled="disabled"{% endif %}
               value="{% trans %}Pay with credit card{% endtrans %}"
             />
           </form>

eboutic/views.py

@@ -16,6 +16,7 @@
 import base64
 import json
 from datetime import datetime
+from enum import Enum
 
 import sentry_sdk
 from cryptography.exceptions import InvalidSignature
@@ -82,6 +83,12 @@ def payment_result(request, result: str) -> HttpResponse:
     return render(request, "eboutic/eboutic_payment_result.jinja", context)
 
 
+class BillingInfoState(Enum):
+    VALID = 1
+    EMPTY = 2
+    MISSING_PHONE_NUMBER = 3
+
+
 class EbouticCommand(LoginRequiredMixin, TemplateView):
     template_name = "eboutic/eboutic_makecommand.jinja"
     basket: Basket
@@ -130,9 +137,16 @@ class EbouticCommand(LoginRequiredMixin, TemplateView):
                 default_billing_info = customer.billing_infos
         else:
             kwargs["customer_amount"] = None
-        kwargs["must_fill_billing_infos"] = default_billing_info is None
-        if not kwargs["must_fill_billing_infos"]:
-            # the user has already filled its billing_infos, thus we can
+        # make the enum available in the template
+        kwargs["BillingInfoState"] = BillingInfoState
+        if default_billing_info is None:
+            kwargs["billing_infos_state"] = BillingInfoState.EMPTY
+        elif default_billing_info.phone_number is None:
+            kwargs["billing_infos_state"] = BillingInfoState.MISSING_PHONE_NUMBER
+        else:
+            kwargs["billing_infos_state"] = BillingInfoState.EMPTY
+        if kwargs["billing_infos_state"] == BillingInfoState.VALID:
+            # the user has already filled all of its billing_infos, thus we can
             # get it without expecting an error
             kwargs["billing_infos"] = dict(self.basket.get_e_transaction_data())
         kwargs["basket"] = self.basket