From 9be4b8f58e168172e25a28c3465485614deec9fe Mon Sep 17 00:00:00 2001
From: Sli <antoine@bartuccio.fr>
Date: Sat, 27 Sep 2025 16:59:43 +0200
Subject: [PATCH] Add macro to refresh messages from htmx swap

---
 core/templates/core/base/notifications.jinja  |  6 ++---
 core/templates/core/macros.jinja              | 23 +++++++++++++++++++
 .../eboutic/eboutic_billing_info.jinja        |  5 ++--
 .../templates/eboutic/eboutic_checkout.jinja  |  3 ++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/core/templates/core/base/notifications.jinja b/core/templates/core/base/notifications.jinja
index b50ec89f..f941a1a6 100644
--- a/core/templates/core/base/notifications.jinja
+++ b/core/templates/core/base/notifications.jinja
@@ -13,10 +13,10 @@
              }"
      @quick-notification-add="(e) => messages.push(e?.detail)"
      @quick-notification-delete="messages = []">
-  <template x-for="message in messages">
-    <div x-data="{show: true}" class="alert" :class="`alert-${message.tag}`" x-show="show" x-transition>
+  <template x-for="(message, index) in messages">
+    <div class="alert" :class="`alert-${message.tag}`" x-transition>
       <span class="alert-main" x-text="message.text"></span>
-      <span class="clickable" @click="show = false">
+      <span class="clickable" @click="messages = messages.filter((item, i) => i !== index)">
         <i class="fa fa-close"></i>
       </span>
     </div>
diff --git a/core/templates/core/macros.jinja b/core/templates/core/macros.jinja
index ba42046f..26f2ca17 100644
--- a/core/templates/core/macros.jinja
+++ b/core/templates/core/macros.jinja
@@ -245,3 +245,26 @@
   <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
   <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
 {% endmacro %}
+
+{% macro update_notifications(messages, clear) %}
+  {# Update notification area from new messages sent by django backend
+     This is useful when performing fragment swaps to keep messages up to date
+     Without this, the fragment would need to take control of the notification area and
+     this would be an issue when having more than one fragment
+
+     Parameters:
+      messages: messages from django.contrib
+      clear   : optional boolean that controls if notifications should be cleared first. True is the default
+  #}
+  {% set clear = clear|default(true) %}
+  {% if messages %}
+    <div x-init="() => {
+                 {% if clear %}
+                   $notifications.clear()
+                 {% endif %}
+                 {% for message in messages %}
+                   $notifications.{{ message.tags }}('{{ message }}')
+                 {% endfor %}
+                 }"></div>
+  {% endif %}
+{% endmacro %}
diff --git a/eboutic/templates/eboutic/eboutic_billing_info.jinja b/eboutic/templates/eboutic/eboutic_billing_info.jinja
index 429aac8b..4084ee47 100644
--- a/eboutic/templates/eboutic/eboutic_billing_info.jinja
+++ b/eboutic/templates/eboutic/eboutic_billing_info.jinja
@@ -1,3 +1,5 @@
+{% from 'core/macros.jinja' import update_notifications %}
+
 <div id=billing-infos-fragment>
   <div
     class="collapse"
@@ -29,7 +31,6 @@
       >
     </form>
   </div>
-
   <br>
-  {% include "core/base/notifications.jinja" %}
+  {{ update_notifications(messages) }}
 </div>
diff --git a/eboutic/templates/eboutic/eboutic_checkout.jinja b/eboutic/templates/eboutic/eboutic_checkout.jinja
index 17210cc5..745d1644 100644
--- a/eboutic/templates/eboutic/eboutic_checkout.jinja
+++ b/eboutic/templates/eboutic/eboutic_checkout.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block notifications %}
-  {# Notifications are moved inside the billing info fragment #}
+  {# Notifications are moved under the billing form #}
 {% endblock %}
 
 {% block title %}
@@ -60,6 +60,7 @@
       <div @htmx:after-request="fill">
         {{ billing_infos_form }}
       </div>
+      {% include "core/base/notifications.jinja" %}
       <form
         method="post"
         action="{{ settings.SITH_EBOUTIC_ET_URL }}"