diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 74e4675..103d649 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy to production on: workflow_dispatch: schedule: - - cron: '0 3,13,19,23 * * *' + - cron: '0 1,22 * * *' jobs: deploy: diff --git a/templates/base.html.twig b/templates/base.html.twig index e46d7d9..452c662 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -56,8 +56,8 @@ { "@type": "ListItem", "position": {{ loop.index }}, - "name": "{{ breadcrumb.name }}"{% if breadcrumb.url is defined and breadcrumb.url is not empty %}, - "item": "{{ absolute_url(breadcrumb.url) }}"{% endif %} + "name": {{ breadcrumb.name|json_encode|raw }}{% if not loop.last and breadcrumb.url is defined and breadcrumb.url is not empty %}, + "item": {{ absolute_url(breadcrumb.url)|json_encode|raw }}{% endif %} }{% if not loop.last %},{% endif %} {% endfor %} ] diff --git a/templates/email/scan_force_notification.html.twig b/templates/email/scan_force_notification.html.twig index e5ea0da..2547e0a 100644 --- a/templates/email/scan_force_notification.html.twig +++ b/templates/email/scan_force_notification.html.twig @@ -6,7 +6,7 @@

Validation forcee

Un billet a ete force lors du scan sur votre evenement. Voici les details :

- +
Details du billet @@ -36,7 +36,7 @@
- +

Force par

diff --git a/templates/home/event_detail.html.twig b/templates/home/event_detail.html.twig index 5f8d3f9..e9e1e3b 100644 --- a/templates/home/event_detail.html.twig +++ b/templates/home/event_detail.html.twig @@ -14,32 +14,32 @@ {% block body %}
-
+
- EVENT + EVENT
-

{{ event.title }}

+

{{ event.title }}

-
+
- + {{ event.address }}, {{ event.zipcode }} {{ event.city }}
- + Du {{ event.startAt|date('d/m/Y H:i') }} au {{ event.endAt|date('d/m/Y H:i') }}
- + {{ organizer.companyName ?? (organizer.firstName ~ ' ' ~ organizer.lastName) }}
-
+
{% for message in app.flashes('success') %}

{{ message }}

@@ -52,14 +52,14 @@
{% if event.eventMainPictureName %} - {{ event.title }} + {{ event.title }} {% else %} -
+
📷
{% endif %}
-
+
{% if event.description %}
{{ event.description|raw }} @@ -103,7 +103,7 @@
{% endif %} {% if not event_ended %} -
+
{% for category in categories %} {% if category.active %} {% set category_billets = billets[category.id] ?? [] %} @@ -113,16 +113,16 @@ {% if category_billets|length > 0 %}
{% for billet in category_billets %} -
-
-
+
+
+
{% if billet.pictureName %} - {{ billet.name }} + {{ billet.name }} {% endif %} -
-

{{ billet.name }}

+
+

{{ billet.name }}

{% if billet.description %} -

{{ billet.description }}

+

{{ billet.description }}

{% endif %}

{% if not billet.unlimited and billet.quantity is not null %} @@ -136,18 +136,19 @@ {% endif %}

+

{{ billet.priceHTDecimal|number_format(2, ',', ' ') }} €

-
-

{{ billet.priceHTDecimal|number_format(2, ',', ' ') }} €

+
+ -
- - - +
+ + +
-

0,00 €

+

0,00 €

@@ -160,19 +161,19 @@ {% endif %} {% endfor %} -
-
- Total - 0,00 € +
+
+ Total + 0,00 €
-
- Articles +
+ Articles 0
-
@@ -185,21 +186,21 @@

Emplacement

-
+
-
-
+
+

Organisateur

-
-
+
+
{% if organizer.logoName %}
{{ organizer.companyName }} @@ -231,7 +232,7 @@

Contacter l'organisateur

-
+
diff --git a/templates/order/_summary.html.twig b/templates/order/_summary.html.twig index e8998ec..d730757 100644 --- a/templates/order/_summary.html.twig +++ b/templates/order/_summary.html.twig @@ -2,20 +2,20 @@

Recapitulatif

-
-

{{ order.event.title }}

+
+

{{ order.event.title }}

{% for item in order.items %} -
-
-

{{ item.billetName }}

+
+
+

{{ item.billetName }}

x{{ item.quantity }} — {{ item.unitPriceHTDecimal|number_format(2, ',', ' ') }} €/u

-

{{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} €

+

{{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} €

{% endfor %} -
+
Total HT {{ order.totalHTDecimal|number_format(2, ',', ' ') }} €
diff --git a/templates/order/guest.html.twig b/templates/order/guest.html.twig index ee81128..84f1a89 100644 --- a/templates/order/guest.html.twig +++ b/templates/order/guest.html.twig @@ -4,14 +4,14 @@ {% block body %}
-

Vos informations

-

Commande {{ order.orderNumber }} — {{ order.event.title }}

+

Vos informations

+

Commande {{ order.orderNumber }} — {{ order.event.title }}

{% for message in app.flashes('error') %}

{{ message }}

{% endfor %} -
+
@@ -32,7 +32,7 @@
-
diff --git a/templates/order/payment.html.twig b/templates/order/payment.html.twig index f9cc252..5e85558 100644 --- a/templates/order/payment.html.twig +++ b/templates/order/payment.html.twig @@ -7,14 +7,14 @@ {% endblock %} {% block body %} -
+

Evenement

-
-

{{ order.event.title }}

+
+

{{ order.event.title }}

{{ order.event.startAt|date('d/m/Y') }} — {{ order.event.startAt|date('H:i') }} a {{ order.event.endAt|date('H:i') }}

{{ order.event.address }}, {{ order.event.zipcode }} {{ order.event.city }}

Par {{ order.event.account.companyName ?? (order.event.account.firstName ~ ' ' ~ order.event.account.lastName) }}

@@ -26,7 +26,7 @@

Acheteur

-
+

Nom

{{ order.lastName }}

@@ -35,9 +35,9 @@

Prenom

{{ order.firstName }}

-
+

Email

-

{{ order.email }}

+

{{ order.email }}

@@ -46,33 +46,33 @@

Billets

-
+
{% for item in order.items %} -
-
-
+
+
+
{% if item.billet and item.billet.pictureName %} - {{ item.billetName }} + {{ item.billetName }} {% endif %} -
-

{{ item.billetName }}

+
+

{{ item.billetName }}

{% if item.billet and item.billet.description %} -

{{ item.billet.description }}

+

{{ item.billet.description }}

{% endif %}
-
+
x{{ item.quantity }} {{ item.unitPriceHTDecimal|number_format(2, ',', ' ') }} €/u - {{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} € + {{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} €
{% endfor %}
- Total - {{ order.totalHTDecimal|number_format(2, ',', ' ') }} € + Total + {{ order.totalHTDecimal|number_format(2, ',', ' ') }} €
@@ -81,9 +81,9 @@

Paiement securise

-
+
@@ -91,7 +91,7 @@ -

Paiement securise par Stripe

diff --git a/templates/order/public.html.twig b/templates/order/public.html.twig index 0e532d4..81cac1c 100644 --- a/templates/order/public.html.twig +++ b/templates/order/public.html.twig @@ -4,15 +4,15 @@ {% block body %}
-

Ma commande

-

Commande {{ order.orderNumber }} — {{ order.event.title }}

+

Ma commande

+

Commande {{ order.orderNumber }} — {{ order.event.title }}

Evenement

-
-

{{ order.event.title }}

+
+

{{ order.event.title }}

{{ order.event.startAt|date('d/m/Y') }} — {{ order.event.startAt|date('H:i') }} a {{ order.event.endAt|date('H:i') }}

{{ order.event.address }}, {{ order.event.zipcode }} {{ order.event.city }}

@@ -21,15 +21,15 @@
-
+

Acheteur

-
+

{{ order.firstName }} {{ order.lastName }}

-

{{ order.email }}

+

{{ order.email }}

{% if order.status == 'paid' %} Payee @@ -49,7 +49,7 @@ {% endif %} {% if order.status == 'paid' %}

- + Telecharger la facture
@@ -62,24 +62,26 @@

Vos billets

-
+
{% for ticket in tickets %} -
+

{{ ticket.billetName }}

-

{{ ticket.reference }}

+

{{ ticket.reference }}

+
+
+ {{ ticket.unitPriceHTDecimal|number_format(2, ',', ' ') }} € + {% if ticket.state == 'valid' %} + Valide + {% elseif ticket.state == 'expired' %} + Expire + {% else %} + Invalide + {% endif %} + + Telecharger PDF +
- {{ ticket.unitPriceHTDecimal|number_format(2, ',', ' ') }} € - {% if ticket.state == 'valid' %} - Valide - {% elseif ticket.state == 'expired' %} - Expire - {% else %} - Invalide - {% endif %} - - Telecharger PDF -
{% endfor %}
diff --git a/templates/order/success.html.twig b/templates/order/success.html.twig index 2a6b9d9..342f4f7 100644 --- a/templates/order/success.html.twig +++ b/templates/order/success.html.twig @@ -5,26 +5,26 @@ {% block body %}
-
+
{% if failed|default(false) %} -
✗
-

Paiement echoue

-

Le paiement n'a pas abouti. Vous pouvez reessayer.

- +
✗
+

Paiement echoue

+

Le paiement n'a pas abouti. Vous pouvez reessayer.

+ Reessayer le paiement {% else %} -
✓
-

Commande confirmee

+
✓
+

Commande confirmee

Merci {{ order.firstName }} !

-

Votre commande {{ order.orderNumber }} a bien ete enregistree.

+

Votre commande {{ order.orderNumber }} a bien ete enregistree.

-
+

Details

{% for item in order.items %} -
- {{ item.billetName }} x{{ item.quantity }} - {{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} € +
+ {{ item.billetName }} x{{ item.quantity }} + {{ item.lineTotalHTDecimal|number_format(2, ',', ' ') }} €
{% endfor %}
@@ -33,13 +33,13 @@
-

Vos billets ont ete envoyes a {{ order.email }}

+

Vos billets ont ete envoyes a {{ order.email }}

- + Telecharger la facture - + Voir ma commande diff --git a/templates/pdf/rgpd_access.html.twig b/templates/pdf/rgpd_access.html.twig index b38181a..d7f6bc5 100644 --- a/templates/pdf/rgpd_access.html.twig +++ b/templates/pdf/rgpd_access.html.twig @@ -1,6 +1,6 @@ -