From 42317bfecc7cfe2f42a2896bc17588b694e416b7 Mon Sep 17 00:00:00 2001 From: Sli Date: Sun, 13 Apr 2025 00:20:57 +0200 Subject: [PATCH] Use django messages for billing info ux --- core/static/core/style.scss | 9 ++- .../eboutic/eboutic_billing_info.jinja | 30 ++++----- .../eboutic/eboutic_makecommand.jinja | 2 +- eboutic/views.py | 35 +++++++++-- locale/fr/LC_MESSAGES/django.po | 62 ++++++++++--------- locale/fr/LC_MESSAGES/djangojs.po | 14 +---- 6 files changed, 83 insertions(+), 69 deletions(-) diff --git a/core/static/core/style.scss b/core/static/core/style.scss index a87ed3a3..37217080 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -361,19 +361,22 @@ body { align-items: center; text-align: justify; - &.alert-yellow { + &.alert-yellow, + &.alert-warning { background-color: rgb(255, 255, 240); color: rgb(99, 87, 6); border: rgb(192, 180, 16) 1px solid; } - &.alert-green { + &.alert-green, + &.alert-success { background-color: rgb(245, 255, 245); color: rgb(3, 84, 63); border: rgb(14, 159, 110) 1px solid; } - &.alert-red { + &.alert-red, + &.alert-error { background-color: rgb(255, 245, 245); color: #c53030; border: #fc8181 1px solid; diff --git a/eboutic/templates/eboutic/eboutic_billing_info.jinja b/eboutic/templates/eboutic/eboutic_billing_info.jinja index 4a1d0739..8a5c8a83 100644 --- a/eboutic/templates/eboutic/eboutic_billing_info.jinja +++ b/eboutic/templates/eboutic/eboutic_billing_info.jinja @@ -1,8 +1,8 @@ - +
@@ -17,11 +17,12 @@ hx-trigger="submit" hx-post="{{ action }}" hx-swap="outerHTML" - hx-target="closest span" + hx-target="#billing-infos-fragment" x-show="collapsed" > {% csrf_token %} {{ form.as_p() }} +
- {% if billing_infos_state == BillingInfoState.EMPTY %} -
- {% trans trimmed %} - You must fill your billing infos if you want to pay with your credit card - {% endtrans %} -
- {% elif billing_infos_state == BillingInfoState.MISSING_PHONE_NUMBER %} -
- {% trans trimmed %} - 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 %} -
+ {% if messages %} + {% for message in messages %} +
+ {{ message }} +
+ {% endfor %} {% endif %} - +
diff --git a/eboutic/templates/eboutic/eboutic_makecommand.jinja b/eboutic/templates/eboutic/eboutic_makecommand.jinja index 530df0e7..1869988f 100644 --- a/eboutic/templates/eboutic/eboutic_makecommand.jinja +++ b/eboutic/templates/eboutic/eboutic_makecommand.jinja @@ -16,7 +16,7 @@

{% trans %}Eboutic{% endtrans %}

diff --git a/eboutic/views.py b/eboutic/views.py index 928bfb63..608d57fe 100644 --- a/eboutic/views.py +++ b/eboutic/views.py @@ -17,6 +17,7 @@ from __future__ import annotations import base64 import contextlib +import json from datetime import datetime from typing import TYPE_CHECKING @@ -26,10 +27,12 @@ from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15 from cryptography.hazmat.primitives.hashes import SHA1 from cryptography.hazmat.primitives.serialization import load_pem_public_key from django.conf import settings +from django.contrib import messages from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import ( LoginRequiredMixin, ) +from django.contrib.messages.views import SuccessMessageMixin from django.core.exceptions import SuspiciousOperation from django.db import DatabaseError, transaction from django.db.utils import cached_property @@ -37,6 +40,7 @@ from django.http import HttpRequest, HttpResponse from django.shortcuts import redirect, render from django.urls import reverse from django.utils.decorators import method_decorator +from django.utils.translation import gettext_lazy as _ from django.views.decorators.http import require_GET, require_POST from django.views.generic import TemplateView, UpdateView, View from django_countries.fields import Country @@ -95,12 +99,15 @@ def payment_result(request, result: str) -> HttpResponse: return render(request, "eboutic/eboutic_payment_result.jinja", context) -class BillingInfoFormFragment(LoginRequiredMixin, FragmentMixin, UpdateView): +class BillingInfoFormFragment( + LoginRequiredMixin, FragmentMixin, SuccessMessageMixin, UpdateView +): """Update billing info""" model = BillingInfo form_class = BillingInfoForm template_name = "eboutic/eboutic_billing_info.jinja" + success_message = _("Billing info registration success") def get_initial(self): if self.object is None: @@ -128,9 +135,26 @@ class BillingInfoFormFragment(LoginRequiredMixin, FragmentMixin, UpdateView): def get_context_data(self, **kwargs): kwargs = super().get_context_data(**kwargs) - kwargs["action"] = reverse("eboutic:billing_infos") - kwargs["BillingInfoState"] = BillingInfoState kwargs["billing_infos_state"] = BillingInfoState.from_model(self.object) + kwargs["action"] = reverse("eboutic:billing_infos") + match BillingInfoState.from_model(self.object): + case BillingInfoState.EMPTY: + messages.warning( + self.request, + _( + "You must fill your billing infos if you want to pay with your credit card" + ), + ) + case BillingInfoState.MISSING_PHONE_NUMBER: + messages.warning( + self.request, + _( + "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.", + ), + ) return kwargs def get_success_url(self, **kwargs): @@ -188,8 +212,11 @@ class EbouticCommand(LoginRequiredMixin, UseFragmentsMixin, TemplateView): kwargs["customer_amount"] = None kwargs["basket"] = self.basket kwargs["billing_infos"] = {} + with contextlib.suppress(BillingInfo.DoesNotExist): - kwargs["billing_infos"] = dict(self.basket.get_e_transaction_data()) + kwargs["billing_infos"] = json.dumps( + dict(self.basket.get_e_transaction_data()) + ) return kwargs diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 11100e5d..cdb22051 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-08 16:20+0200\n" +"POT-Creation-Date: 2025-04-13 00:18+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Maréchal \n" @@ -3770,6 +3770,15 @@ msgstr "panier" msgid "invoice" msgstr "facture" +#: eboutic/templates/eboutic/eboutic_billing_info.jinja +msgid "Billing information" +msgstr "Informations de facturation" + +#: eboutic/templates/eboutic/eboutic_billing_info.jinja +#: eboutic/templates/eboutic/eboutic_main.jinja +msgid "Validate" +msgstr "Valider" + #: eboutic/templates/eboutic/eboutic_main.jinja #: eboutic/templates/eboutic/eboutic_makecommand.jinja msgid "Current account amount: " @@ -3784,11 +3793,6 @@ msgstr "Valeur du panier : " msgid "Clear" msgstr "Vider" -#: eboutic/templates/eboutic/eboutic_main.jinja -#: eboutic/templates/eboutic/eboutic_makecommand.jinja -msgid "Validate" -msgstr "Valider" - #: eboutic/templates/eboutic/eboutic_main.jinja msgid "" "You have not filled in your date of birth. As a result, you may not have " @@ -3837,29 +3841,6 @@ msgstr "État du panier" msgid "Remaining account amount: " msgstr "Solde restant : " -#: eboutic/templates/eboutic/eboutic_makecommand.jinja -msgid "Billing information" -msgstr "Informations de facturation" - -#: eboutic/templates/eboutic/eboutic_makecommand.jinja -msgid "" -"You must fill your billing infos if you want to pay with your credit card" -msgstr "" -"Vous devez renseigner vos coordonnées de facturation si vous voulez payer " -"par carte bancaire" - -#: eboutic/templates/eboutic/eboutic_makecommand.jinja -msgid "" -"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." -msgstr "" -"Le Crédit Agricole a changé sa politique relative aux informations à " -"fournir pour effectuer un paiement par carte bancaire. De ce fait, si vous " -"souhaitez payer par carte, vous devez rajouter un numéro de téléphone aux " -"données que vous aviez déjà fourni." - #: eboutic/templates/eboutic/eboutic_makecommand.jinja msgid "Pay with credit card" msgstr "Payer avec une carte bancaire" @@ -3893,6 +3874,29 @@ msgstr "Le paiement a échoué" msgid "Return to eboutic" msgstr "Retourner à l'eboutic" +#: eboutic/views.py +msgid "Billing info registration success" +msgstr "Informations de facturation enregistrées" + +#: eboutic/views.py +msgid "" +"You must fill your billing infos if you want to pay with your credit card" +msgstr "" +"Vous devez renseigner vos coordonnées de facturation si vous voulez payer " +"par carte bancaire" + +#: eboutic/views.py +msgid "" +"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." +msgstr "" +"Le Crédit Agricole a changé sa politique relative aux informations à " +"fournir pour effectuer un paiement par carte bancaire. De ce fait, si vous " +"souhaitez payer par carte, vous devez rajouter un numéro de téléphone aux " +"données que vous aviez déjà fourni." + #: election/models.py msgid "start candidature" msgstr "début des candidatures" diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index 336f9de7..8c1cc3f6 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-04-09 23:23+0200\n" +"POT-Creation-Date: 2025-04-13 00:18+0200\n" "PO-Revision-Date: 2024-09-17 11:54+0200\n" "Last-Translator: Sli \n" "Language-Team: AE info \n" @@ -247,18 +247,6 @@ msgstr "Types de produits réordonnés !" msgid "Product type reorganisation failed with status code : %d" msgstr "La réorganisation des types de produit a échoué avec le code : %d" -#: eboutic/static/bundled/eboutic/makecommand-index.ts -msgid "Incorrect value" -msgstr "Valeur incorrecte" - -#: eboutic/static/bundled/eboutic/makecommand-index.ts -msgid "Billing info registration success" -msgstr "Informations de facturation enregistrées" - -#: eboutic/static/bundled/eboutic/makecommand-index.ts -msgid "Billing info registration failure" -msgstr "Echec de l'enregistrement des informations de facturation." - #: sas/static/bundled/sas/pictures-download-index.ts msgid "pictures.%(extension)s" msgstr "photos.%(extension)s"