From 49eb1c61ced983e6c4236132146919cedfed5969 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 7 May 2025 23:59:48 +0200 Subject: [PATCH 1/5] feature/move-inscription-page-to-sf : WIP --- app/config/config.yml | 3 + app/config/routing/admin_event.yml | 4 + .../Admin/Event/Inscription/ListAction.php | 153 ++++++++++ .../Model/Repository/TicketRepository.php | 59 ++++ templates/event/inscription/list.html.twig | 287 ++++++++++++++++++ 5 files changed, 506 insertions(+) create mode 100644 sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php create mode 100644 templates/event/inscription/list.html.twig diff --git a/app/config/config.yml b/app/config/config.yml index f8aa39499..d461c82dd 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -128,6 +128,9 @@ parameters: forum_inscriptions: nom: 'Inscriptions' niveau: 'ROLE_FORUM' + url: '/admin/event/inscription' + extra_routes: + - admin_event_inscription_list forum_pending_bankwires: nom: 'Virements en attente' niveau: 'ROLE_ADMIN' diff --git a/app/config/routing/admin_event.yml b/app/config/routing/admin_event.yml index 3591d2186..84d1787a7 100644 --- a/app/config/routing/admin_event.yml +++ b/app/config/routing/admin_event.yml @@ -109,3 +109,7 @@ admin_event_restore: admin_event_votes: path: /votes defaults: {_controller: AppBundle\Controller\Admin\Event\VotesListeAction} + +admin_event_inscription_list: + path: /inscription + defaults: { _controller: AppBundle\Controller\Admin\Event\Inscription\ListAction} diff --git a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php new file mode 100644 index 000000000..8050a757f --- /dev/null +++ b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php @@ -0,0 +1,153 @@ +query->get('id'); + $direction = $request->query->get('direction'); + $sort = $request->query->get('sort'); + $filter = $request->query->get('filter'); + + $event = $id ? $eventActionHelper->getEventById($id) : $eventRepository->getLastEvent(); + + $membersTicket = []; + + $restantes = $this->updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $event->getId(), $membersTicket)['restantes']; + + $stats = $eventStatsRepository->getStats($event->getId()); + + return $this->render('event/inscription/list.html.twig', [ + 'filter' => $filter, + 'direction' => $direction, + 'sort' => $sort, + 'forumTarifsMembers' => $membersTicket, + 'now' => new DateTime(), + 'inscriptions' => $ticketRepository->getTicketsForList($event, $filter, $sort, $direction), + 'restantes' => $restantes, + 'statistiques' => [ + 'premier_jour' => [ + 'inscrits' => $stats->firstDay->registered, + 'confirmes' => $stats->firstDay->confirmed, + 'en_attente_de_reglement' => $stats->firstDay->pending, + ], + 'second_jour' => [ + 'inscrits' => $stats->secondDay->registered, + 'confirmes' => $stats->secondDay->confirmed, + 'en_attente_de_reglement' => $stats->secondDay->pending, + ], + 'types_inscriptions' => [ + 'confirmes' => $stats->ticketType->confirmed, + 'inscrits' => $stats->ticketType->registered, + 'payants' => $stats->ticketType->paying, + ], + ], + 'forumTarifsLib' => [ + AFUP_FORUM_INVITATION => 'Invitation', + AFUP_FORUM_ORGANISATION => 'Organisation', + AFUP_FORUM_PROJET => 'Projet PHP', + AFUP_FORUM_SPONSOR => 'Sponsor', + AFUP_FORUM_PRESSE => 'Presse', + AFUP_FORUM_PROF => 'Enseignement supérieur', + AFUP_FORUM_CONFERENCIER => 'Conferencier', + AFUP_FORUM_PREMIERE_JOURNEE => 'Jour 1 ', + AFUP_FORUM_DEUXIEME_JOURNEE => 'Jour 2', + AFUP_FORUM_2_JOURNEES => '2 Jours', + AFUP_FORUM_2_JOURNEES_AFUP => '2 Jours AFUP', + AFUP_FORUM_PREMIERE_JOURNEE_AFUP => 'Jour 1 AFUP', + AFUP_FORUM_DEUXIEME_JOURNEE_AFUP => 'Jour 2 AFUP', + AFUP_FORUM_2_JOURNEES_ETUDIANT => '2 Jours Etudiant', + AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT => 'Jour 1 Etudiant', + AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT => 'Jour 2 Etudiant', + AFUP_FORUM_2_JOURNEES_PREVENTE => '2 Jours prévente', + AFUP_FORUM_2_JOURNEES_AFUP_PREVENTE => '2 Jours AFUP prévente', + AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION => '2 Jours prévente + adhésion', + AFUP_FORUM_2_JOURNEES_ETUDIANT_PREVENTE => '2 Jours Etudiant prévente', + AFUP_FORUM_2_JOURNEES_COUPON => '2 Jours avec coupon de réduction', + AFUP_FORUM_2_JOURNEES_SPONSOR => '2 Jours par Sponsor', + AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT_PREVENTE => '', + AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT_PREVENTE => '', + AFUP_FORUM_SPECIAL_PRICE => 'Tarif Spécial', + ], + 'forumTarifs' => [ + AFUP_FORUM_INVITATION => 0, + AFUP_FORUM_ORGANISATION => 0, + AFUP_FORUM_SPONSOR => 0, + AFUP_FORUM_PRESSE => 0, + AFUP_FORUM_CONFERENCIER => 0, + AFUP_FORUM_PROJET => 0, + AFUP_FORUM_PROF => 0, + AFUP_FORUM_PREMIERE_JOURNEE => 150, + AFUP_FORUM_DEUXIEME_JOURNEE => 150, + AFUP_FORUM_2_JOURNEES => 250, + AFUP_FORUM_2_JOURNEES_AFUP => 150, + AFUP_FORUM_PREMIERE_JOURNEE_AFUP => 100, + AFUP_FORUM_DEUXIEME_JOURNEE_AFUP => 100, + AFUP_FORUM_2_JOURNEES_ETUDIANT => 150, + AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT => 100, + AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT => 100, + AFUP_FORUM_2_JOURNEES_PREVENTE => 150, + AFUP_FORUM_2_JOURNEES_AFUP_PREVENTE => 150, + AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION => 150, + AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT_PREVENTE => 100, + AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT_PREVENTE => 100, + AFUP_FORUM_2_JOURNEES_ETUDIANT_PREVENTE => 150, + AFUP_FORUM_2_JOURNEES_COUPON => 200, + AFUP_FORUM_2_JOURNEES_SPONSOR => 200, + AFUP_FORUM_SPECIAL_PRICE => 0, + ], + 'event' => $event, + 'event_select_form' => $this->createForm(EventSelectType::class, $event)->createView(), + ]); + } + + private function updateGlobalsForTarif( + EventRepository $eventRepository, + TicketEventTypeRepository $ticketEventTypeRepository, + TicketTypeAvailability $ticketTypeAvailability, + $forumId, + &$membersTickets = [] + ): array { + global $AFUP_Tarifs_Forum, $AFUP_Tarifs_Forum_Lib; + $event = $eventRepository->get($forumId); + $ticketTypes = $ticketEventTypeRepository->getTicketsByEvent($event, false); + $AFUP_Tarifs_Forum_Restantes = []; + + foreach ($ticketTypes as $ticketType) { + /** + * @var $ticketType \AppBundle\Event\Model\TicketEventType + */ + $AFUP_Tarifs_Forum[$ticketType->getTicketTypeId()] = $ticketType->getPrice(); + $AFUP_Tarifs_Forum_Lib[$ticketType->getTicketTypeId()] = $ticketType->getTicketType()->getPrettyName(); + $AFUP_Tarifs_Forum_Restantes[$ticketType->getTicketTypeId()] = $ticketTypeAvailability->getStock($ticketType, $event); + + if ($ticketType->getTicketType()->getIsRestrictedToMembers()) { + $membersTickets[] = $ticketType->getTicketTypeId(); + } + } + + return ['restantes' => $AFUP_Tarifs_Forum_Restantes]; + } +} diff --git a/sources/AppBundle/Event/Model/Repository/TicketRepository.php b/sources/AppBundle/Event/Model/Repository/TicketRepository.php index db70f0b25..a85a37e5f 100644 --- a/sources/AppBundle/Event/Model/Repository/TicketRepository.php +++ b/sources/AppBundle/Event/Model/Repository/TicketRepository.php @@ -214,6 +214,65 @@ public function getAllTicketsForExport() ->query($this->getCollection(new HydratorSingleObject())); } + public function getTicketsForList(Event $event, ?string $filter, ?string $sort, ?string $direction): CollectionInterface + { + $availableSorts = [ + 'date' => 'i.date', + 'name' => 'i.nom', + 'societe' => 'f.societe', + 'type' => 'i.type_inscription', + 'etat' => 'i.etat', + ]; + + $params = [ + 'eventId' => $event->getId() + ]; + + $sql = <<getPreparedQuery($sql) + ->setParams($params) + ->query($this->getCollection(new HydratorArray())) + ; + } + /** * @inheritDoc */ diff --git a/templates/event/inscription/list.html.twig b/templates/event/inscription/list.html.twig new file mode 100644 index 000000000..16eb207b4 --- /dev/null +++ b/templates/event/inscription/list.html.twig @@ -0,0 +1,287 @@ +{% extends 'admin/base_with_header.html.twig' %} + +{% block content %} +

Inscriptions {{ event.title~' '~event.dateStart|date('Y') }}

+ + {% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %} + +
+ +
+ + Ajouter +
+ +
+ + Exports + + +
+ +
+ +
+ + + + + + + + + + + + + + {% set inscritsTotal = 0 %} + {% set confirmesTotal = 0 %} + {% set payantsTotal = 0 %} + {% set montantTotal = 0 %} + + {% for forumTarifKey, forumTarif in forumTarifs %} + {% set inscrits = statistiques.types_inscriptions.inscrits[forumTarifKey]|default(0) %} + {% set confirmes = statistiques.types_inscriptions.confirmes[forumTarifKey]|default(0) %} + {% set payants = statistiques.types_inscriptions.payants[forumTarifKey]|default(0) %} + {% set montant = (statistiques.types_inscriptions.payants[forumTarifKey]|default(0)) * forumTarif %} + {% set inscritsTotal = inscritsTotal + inscrits %} + {% set confirmesTotal = confirmesTotal + confirmes %} + {% set payantsTotal = payantsTotal + payants %} + {% set montantTotal = montantTotal + montant %} + + {% if inscrits != 0 %} + + + + + + + + + + + {% endif %} + {% endfor %} + + + + + + + + + + + + + +
TypeTarifNb inscritsNb ConfirmeNb payantsMontantPlaces restantes
+ {{ forumTarifsLib[forumTarifKey] }} + {{ forumTarif}} €{{ inscrits }}{{ confirmes }}{{ payants }} {{ montant }} {{ restantes[forumTarifKey]|default('') }}
{{ inscritsTotal }}{{ confirmesTotal }}{{ payantsTotal }}{{ montantTotal }}
+ + + + + + + + + + + + + + + + + + + + + + + + +
InscritsConfirmésEn attente de règlement
Jour 1{{ statistiques.premier_jour.inscrits }}{{ statistiques.premier_jour.confirmes }} + {% if statistiques.premier_jour.en_attente_de_reglement == '' %} + 0 + {% else %} + {{ statistiques.premier_jour.en_attente_de_reglement }} + {% endif %} +
Jour 2{{ statistiques.second_jour.inscrits }}{{ statistiques.second_jour.confirmes }} + {% if statistiques.second_jour.en_attente_de_reglement == '' %} + 0 + {% else %} + {{ statistiques.second_jour.en_attente_de_reglement }} + {% endif %} +
+
+ +
+
+
+
+
+ + + +
+
+ +
+
+
+
+ + {% if inscriptions|length > 0 %} + + + + + + + + + + + + + + + {% for key, inscription in inscriptions %} + + + + + + + + {% if inscription.type_inscription in forumTarifsMembers %} + {% if inscription.lastsubscription == null %} + + {% elseif inscription.lastsubscription < now %} + + {% elseif inscription.lastsubscription < event.dateEnd %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + + {% endfor %} + +
DateNom PrénomSociété (facturation)TypeEtatRèg.Statut cotisation 
{% if inscription.date.timestamp is defined %}{{ inscription.date|date("d/m/Y H:m:s")}}{% endif %} + {{ inscription.prenom }} {{ inscription.nom }} + + + + + {{ inscription.societe }} + {% if inscription.societe %} + + + + {% endif %} + {{ forumTarifsLib[inscription.type_inscription] }} + {% if inscription.etat == 0 %} + Créé + {% elseif inscription.etat == 1 %} + Annulé + {% elseif inscription.etat == 2 %} + Erreur + {% elseif inscription.etat == 3 %} + Refusé + {% elseif inscription.etat == 4 %} + Reglé + {% elseif inscription.etat == 5 %} + Invité + {% elseif inscription.etat == 6 %} + Attente règlement + {% elseif inscription.etat == 7 %} + Facturé + {% endif %} + {% if inscription.type_reglement == 0 %}CB{% elseif inscription.type_reglement == 1 %}CHQ{% elseif inscription.type_reglement == 2 %}VIR{% endif %} + + Non trouvée + + + + A expiré le {{ inscription.lastsubscription|date('%d/%m/%Y') }} + + + URL Paiement + + + + Expire le {{ inscription.lastsubscription|date('%d/%m/%Y') }} + + + URL Paiement + + + OK + + n/a + + {% if inscription.type_inscription == constant('AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION') and inscription.etat != 1%} + {# TODO RAPH "cheminTemplate" #} + Générer un mail pour demander la confirmation d'adhésion à l'AFUP + Transformer en adhésion AFUP + {% endif %} + + + + + + + +
+ {% else %} +
+
+ + Aucune inscription +
+
+ {% endif %} +
+{% endblock %} From c202d23b9f67eb6f0304c6930ba087b82efbb68c Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 8 May 2025 08:37:49 +0200 Subject: [PATCH 2/5] =?UTF-8?q?feature/move-inscription-page-to-sf=20:=20F?= =?UTF-8?q?ait=20un=20peu=20de=20m=C3=A9nage=20dans=20le=20code=20rapideme?= =?UTF-8?q?nt=20+=20remplace=20les=20liens=20par=20la=20fonction=20path=20?= =?UTF-8?q?de=20twig=20+=20corrige=20un=20bug=20quand=20on=20tente=20de=20?= =?UTF-8?q?g=C3=A9n=C3=A9rer=20une=20inscription=20pour=20une=20personne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Event/Inscription/ListAction.php | 10 +++---- .../Model/Repository/TicketRepository.php | 3 +- templates/event/inscription/list.html.twig | 28 +++++++++---------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php index 8050a757f..30cd1fbef 100644 --- a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php @@ -35,7 +35,7 @@ public function __invoke( $membersTicket = []; - $restantes = $this->updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $event->getId(), $membersTicket)['restantes']; + $remainingTickets = $this->updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $event->getId(), $membersTicket); $stats = $eventStatsRepository->getStats($event->getId()); @@ -46,7 +46,7 @@ public function __invoke( 'forumTarifsMembers' => $membersTicket, 'now' => new DateTime(), 'inscriptions' => $ticketRepository->getTicketsForList($event, $filter, $sort, $direction), - 'restantes' => $restantes, + 'remainingTickets' => $remainingTickets, 'statistiques' => [ 'premier_jour' => [ 'inscrits' => $stats->firstDay->registered, @@ -133,7 +133,7 @@ private function updateGlobalsForTarif( global $AFUP_Tarifs_Forum, $AFUP_Tarifs_Forum_Lib; $event = $eventRepository->get($forumId); $ticketTypes = $ticketEventTypeRepository->getTicketsByEvent($event, false); - $AFUP_Tarifs_Forum_Restantes = []; + $remainingTickets = []; foreach ($ticketTypes as $ticketType) { /** @@ -141,13 +141,13 @@ private function updateGlobalsForTarif( */ $AFUP_Tarifs_Forum[$ticketType->getTicketTypeId()] = $ticketType->getPrice(); $AFUP_Tarifs_Forum_Lib[$ticketType->getTicketTypeId()] = $ticketType->getTicketType()->getPrettyName(); - $AFUP_Tarifs_Forum_Restantes[$ticketType->getTicketTypeId()] = $ticketTypeAvailability->getStock($ticketType, $event); + $remainingTickets[$ticketType->getTicketTypeId()] = $ticketTypeAvailability->getStock($ticketType, $event); if ($ticketType->getTicketType()->getIsRestrictedToMembers()) { $membersTickets[] = $ticketType->getTicketTypeId(); } } - return ['restantes' => $AFUP_Tarifs_Forum_Restantes]; + return $remainingTickets; } } diff --git a/sources/AppBundle/Event/Model/Repository/TicketRepository.php b/sources/AppBundle/Event/Model/Repository/TicketRepository.php index a85a37e5f..44ce9c35c 100644 --- a/sources/AppBundle/Event/Model/Repository/TicketRepository.php +++ b/sources/AppBundle/Event/Model/Repository/TicketRepository.php @@ -254,8 +254,7 @@ public function getTicketsForList(Event $event, ?string $filter, ?string $sort, FROM afup_inscription_forum i LEFT JOIN afup_facturation_forum f ON i.reference = f.reference - WHERE 1 = 1 - AND i.id_forum = :eventId + WHERE i.id_forum = :eventId SQL; if ($filter) { diff --git a/templates/event/inscription/list.html.twig b/templates/event/inscription/list.html.twig index 16eb207b4..ff8044a40 100644 --- a/templates/event/inscription/list.html.twig +++ b/templates/event/inscription/list.html.twig @@ -6,7 +6,7 @@ {% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %}
- +
Ajouter @@ -17,8 +17,8 @@ Exports
@@ -63,7 +63,7 @@ {{ confirmes }} {{ payants }} {{ montant }} - {{ restantes[forumTarifKey]|default('') }} + {{ remainingTickets[forumTarifKey]|default('') }} {% endif %} @@ -143,7 +143,7 @@ Date Nom Prénom Société (facturation) Type Etat Règ. Statut cotisation @@ -172,7 +172,7 @@ {% if inscription.date.timestamp is defined %}{{ inscription.date|date("d/m/Y H:m:s")}}{% endif %} {{ inscription.prenom }} {{ inscription.nom }} - {{ inscription.societe }} {% if inscription.societe %} - {% if inscription.type_inscription == constant('AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION') and inscription.etat != 1%} {# TODO RAPH "cheminTemplate" #} - Générer un mail pour demander la confirmation d'adhésion à l'AFUP - Transformer en adhésion AFUP + Générer un mail pour demander la confirmation d'adhésion à l'AFUP + Transformer en adhésion AFUP {% endif %} - - Date: Thu, 29 May 2025 00:56:49 +0200 Subject: [PATCH 3/5] =?UTF-8?q?feature/move-inscription-page-to-sf=20:=20S?= =?UTF-8?q?upprime=20l'ancien=20code=20et=20am=C3=A9liore=20le=20nouveau?= =?UTF-8?q?=20controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/seeds/Inscriptions.php | 3 + .../administration/forum_inscriptions.php | 66 +--- .../administration/forum_inscriptions.html | 281 +----------------- .../Admin/Event/Inscription/ListAction.php | 103 +------ .../AppBundle/Controller/Admin/HomeAction.php | 2 +- .../Event/Model/HydratorArrayCallable.php | 23 ++ .../Model/Repository/TicketRepository.php | 13 +- .../Dto/TicketTypeDetailsCollectionDto.php | 33 ++ .../Event/Ticket/Dto/TicketTypeDetailsDto.php | 15 + .../Event/Ticket/TicketTypeAvailability.php | 2 +- .../TicketTypeDetailsCollectionFactory.php | 64 ++++ sources/AppBundle/Slack/MessageFactory.php | 2 +- templates/event/inscription/list.html.twig | 210 +++++++------ 13 files changed, 274 insertions(+), 543 deletions(-) create mode 100644 sources/AppBundle/Event/Model/HydratorArrayCallable.php create mode 100644 sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php create mode 100644 sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php create mode 100644 sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php diff --git a/db/seeds/Inscriptions.php b/db/seeds/Inscriptions.php index d2854a82d..0dec09904 100644 --- a/db/seeds/Inscriptions.php +++ b/db/seeds/Inscriptions.php @@ -11,6 +11,7 @@ public function run(): void // Inscriptions $data = [ [ + 'date' => time(), 'reference' => 'REF-TEST-001', 'type_inscription' => AFUP_FORUM_2_JOURNEES, 'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES], @@ -26,6 +27,7 @@ public function run(): void 'etat' => AFUP_FORUM_ETAT_REGLE, ], [ + 'date' => time(), 'reference' => 'REF-TEST-002', 'type_inscription' => AFUP_FORUM_2_JOURNEES, 'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES], @@ -41,6 +43,7 @@ public function run(): void 'etat' => AFUP_FORUM_ETAT_REGLE, ], [ + 'date' => time(), 'reference' => 'REF-TEST-003', 'type_inscription' => AFUP_FORUM_2_JOURNEES, 'montant' => $GLOBALS['AFUP_Tarifs_Forum'][AFUP_FORUM_2_JOURNEES], diff --git a/htdocs/pages/administration/forum_inscriptions.php b/htdocs/pages/administration/forum_inscriptions.php index aace5dbf6..b4de9b65a 100644 --- a/htdocs/pages/administration/forum_inscriptions.php +++ b/htdocs/pages/administration/forum_inscriptions.php @@ -23,7 +23,7 @@ checkForumRedirection(); -$action = verifierAction(['lister', 'ajouter', 'modifier', 'supprimer','envoyer_convocation']); +$action = verifierAction(['ajouter', 'modifier', 'supprimer','envoyer_convocation']); $tris_valides = ['i.date', 'i.nom', 'f.societe', 'i.etat']; $sens_valides = [ 'desc','asc' ]; $smarty->assign('action', $action); @@ -72,68 +72,14 @@ function updateGlobalsForTarif( $forum_inscriptions = new Inscriptions($bdd); $forum_facturation = new Facturation($bdd); -if ($action == 'lister') { - $list_champs = 'i.id, i.date, i.nom, i.prenom, i.email, f.societe, i.etat, i.coupon, i.type_inscription, f.type_reglement, i.presence_day1, i.presence_day2'; - $list_ordre = 'date desc'; - $list_sens = 'desc'; - $list_associatif = false; - $list_filtre = false; - - if (isset($_GET['tri']) && in_array($_GET['tri'], $tris_valides) - && isset($_GET['sens']) && in_array($_GET['sens'], $sens_valides)) { - $list_ordre = $_GET['tri'] . ' ' . $_GET['sens']; - } - if (isset($_GET['filtre'])) { - $list_filtre = $_GET['filtre']; - } - - chargerForumId(); - - if (!isset($_GET['id_forum']) || intval($_GET['id_forum']) == 0) { - $_GET['id_forum'] = $forum->obtenirDernier(); - } - $forumData = $forum->obtenir($_GET['id_forum']); - $smarty->assign('id_forum', $_GET['id_forum']); - $memberTickets = []; - - $retour = updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $_GET['id_forum'], $memberTickets); - $restantes = $retour['restantes']; - - $smarty->assign('forum_tarifs_members', $memberTickets); - $smarty->assign('forum_tarifs_lib',$AFUP_Tarifs_Forum_Lib); - $smarty->assign('forum_tarifs_restantes', $restantes); - $smarty->assign('forum_tarifs',$AFUP_Tarifs_Forum); - $stats = $eventStatsRepository->getStats((int) $_GET['id_forum']); - $smarty->assign('statistiques', [ - 'premier_jour' => [ - 'inscrits' => $stats->firstDay->registered, - 'confirmes' => $stats->firstDay->confirmed, - 'en_attente_de_reglement' => $stats->firstDay->pending, - ], - 'second_jour' => [ - 'inscrits' => $stats->secondDay->registered, - 'confirmes' => $stats->secondDay->confirmed, - 'en_attente_de_reglement' => $stats->secondDay->pending, - ], - 'types_inscriptions' => [ - 'confirmes' => $stats->ticketType->confirmed, - 'inscrits' => $stats->ticketType->registered, - 'payants' => $stats->ticketType->paying, - ], - ]); - - $smarty->assign('forums', $forum->obtenirListActive()); - $smarty->assign('inscriptions', $forum_inscriptions->obtenirListe($_GET['id_forum'], $list_champs, $list_ordre, $list_associatif, $list_filtre)); - $smarty->assign('finForum', (new \DateTime($forumData['date_fin']))->format('U')); - $smarty->assign('now', (new \DateTime())->format('U')); -} elseif ($action == 'supprimer') { +if ($action == 'supprimer') { /** @var Invoice|null $invoice */ $invoice = $invoiceRepository->getByReference($_GET['id']); if ($forum_inscriptions->supprimerInscription($_GET['id']) && (null === $invoice || $invoiceService->deleteInvoice($invoice))) { Logs::log('Suppression de l\'inscription ' . $_GET['id']); - afficherMessage('L\'inscription a été supprimée', 'index.php?page=forum_inscriptions&action=lister'); + afficherMessage('L\'inscription a été supprimée', '/admin/event/inscription'); } else { - afficherMessage('Une erreur est survenue lors de la suppression de l\'inscription', 'index.php?page=forum_inscriptions&action=lister', true); + afficherMessage('Une erreur est survenue lors de la suppression de l\'inscription', '/admin/event/inscription', true); } } else { $pays = new Pays($bdd); @@ -156,7 +102,7 @@ function updateGlobalsForTarif( } else { $champs = $forum_inscriptions->obtenir($_GET['id']); if ($champs == false) { - afficherMessage('L\'inscription n\'existe plus', 'index.php?page=forum_inscriptions&action=lister'); + afficherMessage('L\'inscription n\'existe plus', '/admin/event/inscription'); exit(0); } $champs2 = $forum_facturation->obtenir($champs['reference']); @@ -409,7 +355,7 @@ function updateGlobalsForTarif( } else { Logs::log('Modification de l\'inscription de ' . $formulaire->exportValue('prenom') . ' ' . $formulaire->exportValue('nom') . ' (' . $_GET['id'] . ')'); } - afficherMessage('L\'inscription a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), 'index.php?page=forum_inscriptions&action=lister&id_forum=' . $valeurs['id_forum']); + afficherMessage('L\'inscription a été ' . (($action == 'ajouter') ? 'ajoutée' : 'modifiée'), '/admin/event/inscription?id=' . $valeurs['id_forum']); } else { $smarty->assign('erreur', 'Une erreur est survenue lors de ' . (($action == 'ajouter') ? "l'ajout" : 'la modification') . ' de l\'inscription'); } diff --git a/htdocs/templates/administration/forum_inscriptions.html b/htdocs/templates/administration/forum_inscriptions.html index 748b90607..c234baa47 100644 --- a/htdocs/templates/administration/forum_inscriptions.html +++ b/htdocs/templates/administration/forum_inscriptions.html @@ -1,279 +1,6 @@ -{if $action == 'lister'} - -

Inscriptions

- -
-
- -
-
-
- - -
-
-
-
-
- -
- -
- - Ajouter -
- -
- - Exports - - -
- -
- -
- - - - - - - - - - - - - - {foreach from=$forum_tarifs item=forum_tarif key=forum_tarif_key} - {assign var=inscrits value=$statistiques.types_inscriptions.inscrits[$forum_tarif_key]|default:0} - {assign var=confirmes value=$statistiques.types_inscriptions.confirmes[$forum_tarif_key]|default:0} - {assign var=payants value=$statistiques.types_inscriptions.payants[$forum_tarif_key]|default:0} - {assign var=montant value=$statistiques.types_inscriptions.payants[$forum_tarif_key]|default:0*$forum_tarif} - {assign var=inscrits_total value=$inscrits_total+$inscrits} - {assign var=confirmes_total value=$confirmes_total+$confirmes} - {assign var=payants_total value=$payants_total+$payants} - {assign var=montant_total value=$montant_total+$montant} - {if $inscrits !== 0} - - - - - - - - - - - {/if} - - {/foreach} - - - - - - - - - - - - - -
TypeTarifNb inscritsNb ConfirmeNb payantsMontantPlaces restantes
- {$forum_tarifs_lib[$forum_tarif_key]} - {$forum_tarif} €{$inscrits}{$confirmes}{$payants} {$montant} {$forum_tarifs_restantes[$forum_tarif_key]|default:''}
{$inscrits_total}{$confirmes_total}{$payants_total}{$montant_total}
- - - - - - - - - - - - - - - - - - - - - - - - -
InscritsConfirmésEn attente de règlement
Jour 1{$statistiques.premier_jour.inscrits}{$statistiques.premier_jour.confirmes}{if $statistiques.premier_jour.en_attente_de_reglement == ''}0{else}{$statistiques.premier_jour.en_attente_de_reglement}{/if}
Jour 2{$statistiques.second_jour.inscrits}{$statistiques.second_jour.confirmes}{if $statistiques.second_jour.en_attente_de_reglement == ''}0{else}{$statistiques.second_jour.en_attente_de_reglement}{/if}
-
- -
-
- {assign var=tri value=$smarty.get.tri|default:''} - {assign var=sens value=$smarty.get.sens|default:''} - {assign var=filtre value=$smarty.get.filtre|default:''|stripslashes} - - - - - -
-
-
- - -
-
- -
-
-
-
- - {if $inscriptions} - - - - - - - - - - - - - - - {foreach from=$inscriptions item=inscription} - - - - - - - - {if $inscription.type_inscription|in_array:$forum_tarifs_members} - {if $inscription.lastsubscription == null} - - {elseif $inscription.lastsubscription < $now} - - {elseif $inscription.lastsubscription < $finForum} - - {else} - - {/if} - {else} - - {/if} - - - {/foreach} - -
DateNom PrénomSociété (facturation)TypeEtatRèg.Statut cotisation 
{$inscription.date|date_format:"%d/%m/%Y %H:%M:%S"} - {$inscription.prenom} {$inscription.nom} - - - - - {$inscription.societe} - {if $inscription.societe} - - - - {/if} - {$forum_tarifs_lib[$inscription.type_inscription]} - {if $inscription.etat == 0} - Créé - {elseif $inscription.etat == 1} - Annulé - {elseif $inscription.etat == 2} - Erreur - {elseif $inscription.etat == 3} - Refusé - {elseif $inscription.etat == 4} - Reglé - {elseif $inscription.etat == 5} - Invité - {elseif $inscription.etat == 6} - Attente règlement - {elseif $inscription.etat == 7} - Facturé - {/if} - {if $inscription.type_reglement == 0}CB{elseif $inscription.type_reglement == 1}CHQ{elseif $inscription.type_reglement == 2}VIR{/if} - - Non trouvée - - - - A expiré le {$inscription.lastsubscription|date_format:'%d/%m/%Y'} - - - URL Paiement - - - - Expire le {$inscription.lastsubscription|date_format:'%d/%m/%Y'} - - - URL Paiement - - - OK - - n/a - - - - - - - - -
- {else} -
-
- - Aucune inscription -
-
- {/if} -
+{if $action == 'ajouter'} +

Ajouter une inscription pour le {$forum_name}

{else} - {if $action == 'ajouter'} -

Ajouter une inscription pour le {$forum_name}

- {else} -

Modifier une inscription pour le {$forum_name}

- {/if} - {include file="formulaire.html"} +

Modifier une inscription pour le {$forum_name}

{/if} +{include file="formulaire.html"} diff --git a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php index 30cd1fbef..271c3e5f9 100644 --- a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php @@ -1,14 +1,17 @@ query->get('id'); $direction = $request->query->get('direction'); $sort = $request->query->get('sort'); $filter = $request->query->get('filter'); - $event = $id ? $eventActionHelper->getEventById($id) : $eventRepository->getLastEvent(); - - $membersTicket = []; - - $remainingTickets = $this->updateGlobalsForTarif($eventRepository, $ticketEventTypeRepository, $ticketTypeAvailability, $event->getId(), $membersTicket); + $event = $eventActionHelper->getEventById($id); $stats = $eventStatsRepository->getStats($event->getId()); @@ -43,10 +43,8 @@ public function __invoke( 'filter' => $filter, 'direction' => $direction, 'sort' => $sort, - 'forumTarifsMembers' => $membersTicket, 'now' => new DateTime(), 'inscriptions' => $ticketRepository->getTicketsForList($event, $filter, $sort, $direction), - 'remainingTickets' => $remainingTickets, 'statistiques' => [ 'premier_jour' => [ 'inscrits' => $stats->firstDay->registered, @@ -64,90 +62,9 @@ public function __invoke( 'payants' => $stats->ticketType->paying, ], ], - 'forumTarifsLib' => [ - AFUP_FORUM_INVITATION => 'Invitation', - AFUP_FORUM_ORGANISATION => 'Organisation', - AFUP_FORUM_PROJET => 'Projet PHP', - AFUP_FORUM_SPONSOR => 'Sponsor', - AFUP_FORUM_PRESSE => 'Presse', - AFUP_FORUM_PROF => 'Enseignement supérieur', - AFUP_FORUM_CONFERENCIER => 'Conferencier', - AFUP_FORUM_PREMIERE_JOURNEE => 'Jour 1 ', - AFUP_FORUM_DEUXIEME_JOURNEE => 'Jour 2', - AFUP_FORUM_2_JOURNEES => '2 Jours', - AFUP_FORUM_2_JOURNEES_AFUP => '2 Jours AFUP', - AFUP_FORUM_PREMIERE_JOURNEE_AFUP => 'Jour 1 AFUP', - AFUP_FORUM_DEUXIEME_JOURNEE_AFUP => 'Jour 2 AFUP', - AFUP_FORUM_2_JOURNEES_ETUDIANT => '2 Jours Etudiant', - AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT => 'Jour 1 Etudiant', - AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT => 'Jour 2 Etudiant', - AFUP_FORUM_2_JOURNEES_PREVENTE => '2 Jours prévente', - AFUP_FORUM_2_JOURNEES_AFUP_PREVENTE => '2 Jours AFUP prévente', - AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION => '2 Jours prévente + adhésion', - AFUP_FORUM_2_JOURNEES_ETUDIANT_PREVENTE => '2 Jours Etudiant prévente', - AFUP_FORUM_2_JOURNEES_COUPON => '2 Jours avec coupon de réduction', - AFUP_FORUM_2_JOURNEES_SPONSOR => '2 Jours par Sponsor', - AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT_PREVENTE => '', - AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT_PREVENTE => '', - AFUP_FORUM_SPECIAL_PRICE => 'Tarif Spécial', - ], - 'forumTarifs' => [ - AFUP_FORUM_INVITATION => 0, - AFUP_FORUM_ORGANISATION => 0, - AFUP_FORUM_SPONSOR => 0, - AFUP_FORUM_PRESSE => 0, - AFUP_FORUM_CONFERENCIER => 0, - AFUP_FORUM_PROJET => 0, - AFUP_FORUM_PROF => 0, - AFUP_FORUM_PREMIERE_JOURNEE => 150, - AFUP_FORUM_DEUXIEME_JOURNEE => 150, - AFUP_FORUM_2_JOURNEES => 250, - AFUP_FORUM_2_JOURNEES_AFUP => 150, - AFUP_FORUM_PREMIERE_JOURNEE_AFUP => 100, - AFUP_FORUM_DEUXIEME_JOURNEE_AFUP => 100, - AFUP_FORUM_2_JOURNEES_ETUDIANT => 150, - AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT => 100, - AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT => 100, - AFUP_FORUM_2_JOURNEES_PREVENTE => 150, - AFUP_FORUM_2_JOURNEES_AFUP_PREVENTE => 150, - AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION => 150, - AFUP_FORUM_PREMIERE_JOURNEE_ETUDIANT_PREVENTE => 100, - AFUP_FORUM_DEUXIEME_JOURNEE_ETUDIANT_PREVENTE => 100, - AFUP_FORUM_2_JOURNEES_ETUDIANT_PREVENTE => 150, - AFUP_FORUM_2_JOURNEES_COUPON => 200, - AFUP_FORUM_2_JOURNEES_SPONSOR => 200, - AFUP_FORUM_SPECIAL_PRICE => 0, - ], + 'ticketTypesDetailsCollection' => $ticketTypeDetailsCollectionFactory->create($event), 'event' => $event, - 'event_select_form' => $this->createForm(EventSelectType::class, $event)->createView(), + 'event_select_form' => $eventSelectFactory->create($event, $request)->createView(), ]); } - - private function updateGlobalsForTarif( - EventRepository $eventRepository, - TicketEventTypeRepository $ticketEventTypeRepository, - TicketTypeAvailability $ticketTypeAvailability, - $forumId, - &$membersTickets = [] - ): array { - global $AFUP_Tarifs_Forum, $AFUP_Tarifs_Forum_Lib; - $event = $eventRepository->get($forumId); - $ticketTypes = $ticketEventTypeRepository->getTicketsByEvent($event, false); - $remainingTickets = []; - - foreach ($ticketTypes as $ticketType) { - /** - * @var $ticketType \AppBundle\Event\Model\TicketEventType - */ - $AFUP_Tarifs_Forum[$ticketType->getTicketTypeId()] = $ticketType->getPrice(); - $AFUP_Tarifs_Forum_Lib[$ticketType->getTicketTypeId()] = $ticketType->getTicketType()->getPrettyName(); - $remainingTickets[$ticketType->getTicketTypeId()] = $ticketTypeAvailability->getStock($ticketType, $event); - - if ($ticketType->getTicketType()->getIsRestrictedToMembers()) { - $membersTickets[] = $ticketType->getTicketTypeId(); - } - } - - return $remainingTickets; - } } diff --git a/sources/AppBundle/Controller/Admin/HomeAction.php b/sources/AppBundle/Controller/Admin/HomeAction.php index a55206344..0853cb6c8 100644 --- a/sources/AppBundle/Controller/Admin/HomeAction.php +++ b/sources/AppBundle/Controller/Admin/HomeAction.php @@ -51,7 +51,7 @@ public function __invoke(): Response } $info['statistics']['montant total'] = number_format($montantTotal, 0, ',', "\u{a0}") . "\u{a0}€"; - $info['url'] = '/pages/administration/index.php?page=forum_inscriptions&id_forum=' . $event->getId(); + $info['url'] = '/admin/event/inscription?id=' . $event->getId(); $cards[] = $info; } diff --git a/sources/AppBundle/Event/Model/HydratorArrayCallable.php b/sources/AppBundle/Event/Model/HydratorArrayCallable.php new file mode 100644 index 000000000..4df253d11 --- /dev/null +++ b/sources/AppBundle/Event/Model/HydratorArrayCallable.php @@ -0,0 +1,23 @@ + $data) { + ($this->getIteratorClosure)($key, $data); + + yield $key => $data; + } + } +} diff --git a/sources/AppBundle/Event/Model/Repository/TicketRepository.php b/sources/AppBundle/Event/Model/Repository/TicketRepository.php index 44ce9c35c..afc9bf500 100644 --- a/sources/AppBundle/Event/Model/Repository/TicketRepository.php +++ b/sources/AppBundle/Event/Model/Repository/TicketRepository.php @@ -5,9 +5,11 @@ namespace AppBundle\Event\Model\Repository; use AppBundle\Event\Model\Event; +use AppBundle\Event\Model\HydratorArrayCallable; use AppBundle\Event\Model\Invoice; use AppBundle\Event\Model\Ticket; use AppBundle\Event\Model\TicketType; +use AppBundle\Ting\DateTimeWithTimeZoneSerializer; use CCMBenchmark\Ting\Driver\Mysqli\Serializer\Boolean; use CCMBenchmark\Ting\Query\QueryException; use CCMBenchmark\Ting\Repository\CollectionInterface; @@ -225,7 +227,7 @@ public function getTicketsForList(Event $event, ?string $filter, ?string $sort, ]; $params = [ - 'eventId' => $event->getId() + 'eventId' => $event->getId(), ]; $sql = <<getPreparedQuery($sql) ->setParams($params) - ->query($this->getCollection(new HydratorArray())) + ->query($this->getCollection(new HydratorArrayCallable(function (mixed $key, array &$data): void { + if (!$data['lastsubscription']) { + return; + } + + $data['lastsubscription'] = (new DateTimeWithTimeZoneSerializer())->unserialize($data['lastsubscription'], ['format' => 'U']); + }))) ; } @@ -300,6 +308,7 @@ public static function initMetadata(SerializerFactoryInterface $serializerFactor 'unserialize' => ['unSerializeUseFormat' => true, 'format' => 'U'], 'serialize' => ['format' => 'U'], ], + 'serializer' => DateTimeWithTimeZoneSerializer::class, ]) ->addField([ 'columnName' => 'reference', diff --git a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php new file mode 100644 index 000000000..2a38764a5 --- /dev/null +++ b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php @@ -0,0 +1,33 @@ + $ticketTypeDetailsCollectionDto */ + public function __construct( + private array $ticketTypeDetailsCollectionDto = [], + public array $ticketTypeForMemberOnly = [], + ) {} + + public function addTicketTypeDetails(int $id, TicketTypeDetailsDto $ticketTypeDetailsDto, bool $isForMemberOnly): void + { + $this->ticketTypeDetailsCollectionDto[$id] = $ticketTypeDetailsDto; + + if ($isForMemberOnly) { + $this->ticketTypeForMemberOnly[$id] = $id; + } + } + + public function getTicketTypeDetailsCollectionDto(): array + { + return $this->ticketTypeDetailsCollectionDto; + } + + public function getTicketTypeDetails(int $id): ?TicketTypeDetailsDto + { + return $this->ticketTypeDetailsCollectionDto[$id] ?? null; + } +} diff --git a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php new file mode 100644 index 000000000..474e0cccd --- /dev/null +++ b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php @@ -0,0 +1,15 @@ +getTicketType()->getTechnicalName() == TicketType::SPECIAL_PRICE_TECHNICAL_NAME) { diff --git a/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php b/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php new file mode 100644 index 000000000..031ae5b03 --- /dev/null +++ b/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php @@ -0,0 +1,64 @@ +ticketEventTypeRepository->getTicketsByEvent($event, false); + $ticketTypeDetailsCollectionDto = $this->createFromGlobals(); + + foreach ($ticketEventTypes as $ticketEventType) { + $id = $ticketEventType->getTicketTypeId(); + + $ticketTypeDetailsCollectionDto->addTicketTypeDetails($id, + new TicketTypeDetailsDto( + $id, + $ticketEventType->getTicketType()->getPrettyName(), + $ticketEventType->getPrice(), + $this->ticketTypeAvailability->getStock($ticketEventType, $event), + ), + $ticketEventType->getTicketType()->getIsRestrictedToMembers(), + ); + } + + + return $ticketTypeDetailsCollectionDto; + } + + // Compatibilité Legacy, à supprimer et remplacer par un simple "new TicketTypeDetailsCollectionDto()"; + private function createFromGlobals(): TicketTypeDetailsCollectionDto + { + global $AFUP_Tarifs_Forum, $AFUP_Tarifs_Forum_Lib; + + $ticketTypeDetailsCollectionDto = new TicketTypeDetailsCollectionDto(); + + foreach ($AFUP_Tarifs_Forum_Lib as $id => $tarifLabel) { + $ticketTypeDetailsCollectionDto->addTicketTypeDetails( + $id, + new TicketTypeDetailsDto( + $id, + $tarifLabel, + $AFUP_Tarifs_Forum[$id] ?? 0, + null, + ), + false, + ); + } + + return $ticketTypeDetailsCollectionDto; + } +} diff --git a/sources/AppBundle/Slack/MessageFactory.php b/sources/AppBundle/Slack/MessageFactory.php index 1133dacde..1a453e36a 100644 --- a/sources/AppBundle/Slack/MessageFactory.php +++ b/sources/AppBundle/Slack/MessageFactory.php @@ -203,7 +203,7 @@ public function createMessageForTicketStats(Event $event, EventStatsRepository $ $attachment = new Attachment(); $attachment ->setTitle('Total des inscriptions') - ->setTitleLink('https://afup.org/pages/administration/index.php?page=forum_inscriptions') + ->setTitleLink('https://afup.org/admin/event/inscription') ; diff --git a/templates/event/inscription/list.html.twig b/templates/event/inscription/list.html.twig index ff8044a40..26cdfd15c 100644 --- a/templates/event/inscription/list.html.twig +++ b/templates/event/inscription/list.html.twig @@ -43,11 +43,11 @@ {% set payantsTotal = 0 %} {% set montantTotal = 0 %} - {% for forumTarifKey, forumTarif in forumTarifs %} - {% set inscrits = statistiques.types_inscriptions.inscrits[forumTarifKey]|default(0) %} - {% set confirmes = statistiques.types_inscriptions.confirmes[forumTarifKey]|default(0) %} - {% set payants = statistiques.types_inscriptions.payants[forumTarifKey]|default(0) %} - {% set montant = (statistiques.types_inscriptions.payants[forumTarifKey]|default(0)) * forumTarif %} + {% for ticketTypeId, ticketTypeDetails in ticketTypesDetailsCollection.ticketTypeDetailsCollectionDto %} + {% set inscrits = statistiques.types_inscriptions.inscrits[ticketTypeId]|default(0) %} + {% set confirmes = statistiques.types_inscriptions.confirmes[ticketTypeId]|default(0) %} + {% set payants = statistiques.types_inscriptions.payants[ticketTypeId]|default(0) %} + {% set montant = (statistiques.types_inscriptions.payants[ticketTypeId]|default(0)) * ticketTypeDetails.price %} {% set inscritsTotal = inscritsTotal + inscrits %} {% set confirmesTotal = confirmesTotal + confirmes %} {% set payantsTotal = payantsTotal + payants %} @@ -56,31 +56,30 @@ {% if inscrits != 0 %} - {{ forumTarifsLib[forumTarifKey] }} + {{ ticketTypeDetails.name }} - {{ forumTarif}} € + {{ ticketTypeDetails.price }} € {{ inscrits }} {{ confirmes }} {{ payants }} - {{ montant }} - {{ remainingTickets[forumTarifKey]|default('') }} + {{ montant }} + {{ ticketTypeDetails.remainingTickets|default('') }} {% endif %} {% endfor %} - - - - {{ inscritsTotal }} - {{ confirmesTotal }} - {{ payantsTotal }} - {{ montantTotal }} - - + + + + {{ inscritsTotal }} + {{ confirmesTotal }} + {{ payantsTotal }} + {{ montantTotal }} + - + @@ -163,114 +162,109 @@ })) }}">Etat - + {% for key, inscription in inscriptions %} - - - + - - - - {% if inscription.type_inscription in forumTarifsMembers %} - {% if inscription.lastsubscription == null %} - - {% elseif inscription.lastsubscription < now %} - + + + + + {% if inscription.type_inscription in ticketTypesDetailsCollection.ticketTypeForMemberOnly %} + {% if inscription.lastsubscription == null %} + + {% elseif inscription.lastsubscription < now %} + - {% elseif inscription.lastsubscription < event.dateEnd %} - + {% elseif inscription.lastsubscription < event.dateEnd %} + + + URL Paiement + + + {% else %} + + {% endif %} {% else %} {% endif %} - {% else %} - - {% endif %} - + + + + {% endfor %} From 34845b14217dbc83fc4e73e8053459c4ccef1306 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 30 May 2025 22:10:42 +0200 Subject: [PATCH 4/5] feature/move-inscription-page-to-sf : Fix les tests en factorisant la conversion des messages flash legacy au nouveua format des messages flash --- .../Controller/Admin/Event/ListAction.php | 8 ---- .../AppBundle/Controller/LegacyController.php | 8 ---- ...onvertLegacyFlashMessageKernelListener.php | 39 +++++++++++++++++++ 3 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 sources/AppBundle/Listener/ConvertLegacyFlashMessageKernelListener.php diff --git a/sources/AppBundle/Controller/Admin/Event/ListAction.php b/sources/AppBundle/Controller/Admin/Event/ListAction.php index 722e53f2d..f5ee7536c 100644 --- a/sources/AppBundle/Controller/Admin/Event/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Event/ListAction.php @@ -14,14 +14,6 @@ public function __construct(private readonly EventRepository $eventRepository) { public function __invoke(): Response { - //TODO : à supprimer quand les actions via le formulaire auront été migée - if (isset($_SESSION['flash']['message'])) { - $this->addFlash('notice', $_SESSION['flash']['message']); - } - if (isset($_SESSION['flash']['erreur'])) { - $this->addFlash('error', $_SESSION['flash']['erreur']); - } - unset($_SESSION['flash']); $list = $this->eventRepository->getList(); return $this->render('admin/event/list.html.twig', [ 'events' => $list, diff --git a/sources/AppBundle/Controller/LegacyController.php b/sources/AppBundle/Controller/LegacyController.php index 69a5b5d08..4e73c4837 100644 --- a/sources/AppBundle/Controller/LegacyController.php +++ b/sources/AppBundle/Controller/LegacyController.php @@ -76,14 +76,6 @@ public function backOffice() // Initialisation de AFUP_Log Logs::initialiser($bdd, $droits->obtenirIdentifiant()); require_once __DIR__ . '/../../../htdocs/pages/administration/' . $_GET['page'] . '.php'; - // On gère des infos popups - if (isset($_SESSION['flash']['message'])) { - $this->addFlash('notice', $_SESSION['flash']['message']); - } - if (isset($_SESSION['flash']['erreur'])) { - $this->addFlash('error', $_SESSION['flash']['erreur']); - } - unset($_SESSION['flash']); // Récupération du contenu de la page généré par smarty $content = $smarty->fetch($_GET['page'] . '.html'); diff --git a/sources/AppBundle/Listener/ConvertLegacyFlashMessageKernelListener.php b/sources/AppBundle/Listener/ConvertLegacyFlashMessageKernelListener.php new file mode 100644 index 000000000..393cfe03c --- /dev/null +++ b/sources/AppBundle/Listener/ConvertLegacyFlashMessageKernelListener.php @@ -0,0 +1,39 @@ +requestStack->getSession(); + } catch (SessionNotFoundException) { + return; + } + + if (!$session instanceof FlashBagAwareSessionInterface) { + return; + } + + if (isset($_SESSION['flash']['message'])) { + $session->getFlashBag()->add('notice', $_SESSION['flash']['message']); + } + if (isset($_SESSION['flash']['erreur'])) { + $session->getFlashBag()->add('error', $_SESSION['flash']['erreur']); + } + unset($_SESSION['flash']); + } +} From 5bcf6f20da0e6c631c74b9fda9cf8624b7af5d77 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 2 Sep 2025 17:46:06 +0200 Subject: [PATCH 5/5] #1776 : Fix review --- .../Admin/Event/Inscription/ListAction.php | 24 ++------------ .../Model/Repository/TicketRepository.php | 2 +- .../Dto/TicketTypeDetailsCollectionDto.php | 15 +++++++-- .../Event/Ticket/Dto/TicketTypeDetailsDto.php | 2 +- .../TicketTypeDetailsCollectionFactory.php | 3 +- .../Model => Ting}/HydratorArrayCallable.php | 5 +-- templates/event/inscription/list.html.twig | 32 +++++++++---------- 7 files changed, 37 insertions(+), 46 deletions(-) rename sources/AppBundle/{Event/Model => Ting}/HydratorArrayCallable.php (83%) diff --git a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php index 271c3e5f9..3b62dd043 100644 --- a/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php +++ b/sources/AppBundle/Controller/Admin/Event/Inscription/ListAction.php @@ -12,7 +12,6 @@ use AppBundle\Event\Model\Repository\TicketRepository; use AppBundle\Event\Ticket\TicketTypeAvailability; use AppBundle\Event\Ticket\TicketTypeDetailsCollectionFactory; -use DateTime; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -31,8 +30,8 @@ public function __invoke( TicketTypeDetailsCollectionFactory $ticketTypeDetailsCollectionFactory, ): Response { $id = $request->query->get('id'); - $direction = $request->query->get('direction'); - $sort = $request->query->get('sort'); + $direction = $request->query->get('direction', 'DESC'); + $sort = $request->query->get('sort', 'date'); $filter = $request->query->get('filter'); $event = $eventActionHelper->getEventById($id); @@ -43,25 +42,8 @@ public function __invoke( 'filter' => $filter, 'direction' => $direction, 'sort' => $sort, - 'now' => new DateTime(), 'inscriptions' => $ticketRepository->getTicketsForList($event, $filter, $sort, $direction), - 'statistiques' => [ - 'premier_jour' => [ - 'inscrits' => $stats->firstDay->registered, - 'confirmes' => $stats->firstDay->confirmed, - 'en_attente_de_reglement' => $stats->firstDay->pending, - ], - 'second_jour' => [ - 'inscrits' => $stats->secondDay->registered, - 'confirmes' => $stats->secondDay->confirmed, - 'en_attente_de_reglement' => $stats->secondDay->pending, - ], - 'types_inscriptions' => [ - 'confirmes' => $stats->ticketType->confirmed, - 'inscrits' => $stats->ticketType->registered, - 'payants' => $stats->ticketType->paying, - ], - ], + 'statistiques' => $stats, 'ticketTypesDetailsCollection' => $ticketTypeDetailsCollectionFactory->create($event), 'event' => $event, 'event_select_form' => $eventSelectFactory->create($event, $request)->createView(), diff --git a/sources/AppBundle/Event/Model/Repository/TicketRepository.php b/sources/AppBundle/Event/Model/Repository/TicketRepository.php index afc9bf500..311d50223 100644 --- a/sources/AppBundle/Event/Model/Repository/TicketRepository.php +++ b/sources/AppBundle/Event/Model/Repository/TicketRepository.php @@ -5,11 +5,11 @@ namespace AppBundle\Event\Model\Repository; use AppBundle\Event\Model\Event; -use AppBundle\Event\Model\HydratorArrayCallable; use AppBundle\Event\Model\Invoice; use AppBundle\Event\Model\Ticket; use AppBundle\Event\Model\TicketType; use AppBundle\Ting\DateTimeWithTimeZoneSerializer; +use AppBundle\Ting\HydratorArrayCallable; use CCMBenchmark\Ting\Driver\Mysqli\Serializer\Boolean; use CCMBenchmark\Ting\Query\QueryException; use CCMBenchmark\Ting\Repository\CollectionInterface; diff --git a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php index 2a38764a5..6f1cf0128 100644 --- a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php +++ b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsCollectionDto.php @@ -6,14 +6,18 @@ final class TicketTypeDetailsCollectionDto { - /** @param array $ticketTypeDetailsCollectionDto */ + /** + * @param array $ticketTypeDetailsCollectionDto + * @param array $ticketTypeForMemberOnly + */ public function __construct( private array $ticketTypeDetailsCollectionDto = [], - public array $ticketTypeForMemberOnly = [], + private array $ticketTypeForMemberOnly = [], ) {} - public function addTicketTypeDetails(int $id, TicketTypeDetailsDto $ticketTypeDetailsDto, bool $isForMemberOnly): void + public function addTicketTypeDetails(TicketTypeDetailsDto $ticketTypeDetailsDto, bool $isForMemberOnly): void { + $id = $ticketTypeDetailsDto->id; $this->ticketTypeDetailsCollectionDto[$id] = $ticketTypeDetailsDto; if ($isForMemberOnly) { @@ -21,6 +25,11 @@ public function addTicketTypeDetails(int $id, TicketTypeDetailsDto $ticketTypeDe } } + public function getTicketTypeForMemberOnly(): array + { + return $this->ticketTypeForMemberOnly; + } + public function getTicketTypeDetailsCollectionDto(): array { return $this->ticketTypeDetailsCollectionDto; diff --git a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php index 474e0cccd..4ec7d9eb4 100644 --- a/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php +++ b/sources/AppBundle/Event/Ticket/Dto/TicketTypeDetailsDto.php @@ -4,7 +4,7 @@ namespace AppBundle\Event\Ticket\Dto; -final class TicketTypeDetailsDto +final readonly class TicketTypeDetailsDto { public function __construct( public int $id, diff --git a/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php b/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php index 031ae5b03..9f3f9baef 100644 --- a/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php +++ b/sources/AppBundle/Event/Ticket/TicketTypeDetailsCollectionFactory.php @@ -24,7 +24,7 @@ public function create(Event $event): TicketTypeDetailsCollectionDto foreach ($ticketEventTypes as $ticketEventType) { $id = $ticketEventType->getTicketTypeId(); - $ticketTypeDetailsCollectionDto->addTicketTypeDetails($id, + $ticketTypeDetailsCollectionDto->addTicketTypeDetails( new TicketTypeDetailsDto( $id, $ticketEventType->getTicketType()->getPrettyName(), @@ -48,7 +48,6 @@ private function createFromGlobals(): TicketTypeDetailsCollectionDto foreach ($AFUP_Tarifs_Forum_Lib as $id => $tarifLabel) { $ticketTypeDetailsCollectionDto->addTicketTypeDetails( - $id, new TicketTypeDetailsDto( $id, $tarifLabel, diff --git a/sources/AppBundle/Event/Model/HydratorArrayCallable.php b/sources/AppBundle/Ting/HydratorArrayCallable.php similarity index 83% rename from sources/AppBundle/Event/Model/HydratorArrayCallable.php rename to sources/AppBundle/Ting/HydratorArrayCallable.php index 4df253d11..caf1225fc 100644 --- a/sources/AppBundle/Event/Model/HydratorArrayCallable.php +++ b/sources/AppBundle/Ting/HydratorArrayCallable.php @@ -2,17 +2,18 @@ declare(strict_types=1); -namespace AppBundle\Event\Model; +namespace AppBundle\Ting; use CCMBenchmark\Ting\Repository\HydratorArray; use Closure; +use Generator; final class HydratorArrayCallable extends HydratorArray { public function __construct(private readonly Closure $getIteratorClosure) {} #[\ReturnTypeWillChange] - public function getIterator() + public function getIterator(): Generator { foreach (parent::getIterator() as $key => $data) { ($this->getIteratorClosure)($key, $data); diff --git a/templates/event/inscription/list.html.twig b/templates/event/inscription/list.html.twig index 26cdfd15c..b91cfb882 100644 --- a/templates/event/inscription/list.html.twig +++ b/templates/event/inscription/list.html.twig @@ -1,7 +1,7 @@ {% extends 'admin/base_with_header.html.twig' %} {% block content %} -

Inscriptions {{ event.title~' '~event.dateStart|date('Y') }}

+

Inscriptions {{ event.title }}

{% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %} @@ -44,10 +44,10 @@ {% set montantTotal = 0 %} {% for ticketTypeId, ticketTypeDetails in ticketTypesDetailsCollection.ticketTypeDetailsCollectionDto %} - {% set inscrits = statistiques.types_inscriptions.inscrits[ticketTypeId]|default(0) %} - {% set confirmes = statistiques.types_inscriptions.confirmes[ticketTypeId]|default(0) %} - {% set payants = statistiques.types_inscriptions.payants[ticketTypeId]|default(0) %} - {% set montant = (statistiques.types_inscriptions.payants[ticketTypeId]|default(0)) * ticketTypeDetails.price %} + {% set inscrits = statistiques.ticketType.registered[ticketTypeId]|default(0) %} + {% set confirmes = statistiques.ticketType.confirmed[ticketTypeId]|default(0) %} + {% set payants = statistiques.ticketType.paying[ticketTypeId]|default(0) %} + {% set montant = (statistiques.ticketType.paying[ticketTypeId]|default(0)) * ticketTypeDetails.price %} {% set inscritsTotal = inscritsTotal + inscrits %} {% set confirmesTotal = confirmesTotal + confirmes %} {% set payantsTotal = payantsTotal + payants %} @@ -94,25 +94,25 @@ - - + + - - + + @@ -168,7 +168,7 @@ {% for key, inscription in inscriptions %} - + - {% if inscription.type_inscription in ticketTypesDetailsCollection.ticketTypeForMemberOnly %} + {% if inscription.type_inscription in ticketTypesDetailsCollection.getTicketTypeForMemberOnly() %} {% if inscription.lastsubscription == null %} - {% elseif inscription.lastsubscription < now %} + {% elseif inscription.lastsubscription < date() %}
Règ. Statut cotisation  
{% if inscription.date.timestamp is defined %}{{ inscription.date|date("d/m/Y H:m:s")}}{% endif %} - {{ inscription.prenom }} {{ inscription.nom }} - - - - - {{ inscription.societe }} - {% if inscription.societe %} - {% if inscription.date > 0 %}{{ inscription.date|date("d/m/Y H:m:s") }}{% endif %} + {{ inscription.prenom }} {{ inscription.nom }} + - {% endif %} - {{ forumTarifsLib[inscription.type_inscription] }} - {% if inscription.etat == 0 %} - Créé - {% elseif inscription.etat == 1 %} - Annulé - {% elseif inscription.etat == 2 %} - Erreur - {% elseif inscription.etat == 3 %} - Refusé - {% elseif inscription.etat == 4 %} - Reglé - {% elseif inscription.etat == 5 %} - Invité - {% elseif inscription.etat == 6 %} - Attente règlement - {% elseif inscription.etat == 7 %} - Facturé - {% endif %} - {% if inscription.type_reglement == 0 %}CB{% elseif inscription.type_reglement == 1 %}CHQ{% elseif inscription.type_reglement == 2 %}VIR{% endif %} - - Non trouvée - - + + {{ inscription.societe }} + {% if inscription.societe %} + + + + {% endif %} + {{ ticketTypesDetailsCollection.ticketTypeDetails(inscription.type_inscription).name|default() }} + {% if inscription.etat == 0 %} + Créé + {% elseif inscription.etat == 1 %} + Annulé + {% elseif inscription.etat == 2 %} + Erreur + {% elseif inscription.etat == 3 %} + Refusé + {% elseif inscription.etat == 4 %} + Reglé + {% elseif inscription.etat == 5 %} + Invité + {% elseif inscription.etat == 6 %} + Attente règlement + {% elseif inscription.etat == 7 %} + Facturé + {% endif %} + {% if inscription.type_reglement == 0 %}CB{% elseif inscription.type_reglement == 1 %}CHQ{% elseif inscription.type_reglement == 2 %}VIR{% endif %} + + Non trouvée + + - A expiré le {{ inscription.lastsubscription|date('%d/%m/%Y') }} + A expiré le {{ inscription.lastsubscription|date('d/m/Y') }} - - URL Paiement - - + + URL Paiement + + - Expire le {{ inscription.lastsubscription|date('%d/%m/%Y') }} + Expire le {{ inscription.lastsubscription|date('d/m/Y') }} - - URL Paiement - - + OK + - OK + n/a - n/a - - {% if inscription.type_inscription == constant('AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION') and inscription.etat != 1%} - {# TODO RAPH "cheminTemplate" #} - Générer un mail pour demander la confirmation d'adhésion à l'AFUP - Transformer en adhésion AFUP - {% endif %} - - - + + + + - - - -
Jour 1{{ statistiques.premier_jour.inscrits }}{{ statistiques.premier_jour.confirmes }}{{ statistiques.firstDay.registered }}{{ statistiques.firstDay.confirmed }} - {% if statistiques.premier_jour.en_attente_de_reglement == '' %} + {% if statistiques.firstDay.pending == '' %} 0 {% else %} - {{ statistiques.premier_jour.en_attente_de_reglement }} + {{ statistiques.firstDay.pending }} {% endif %}
Jour 2{{ statistiques.second_jour.inscrits }}{{ statistiques.second_jour.confirmes }}{{ statistiques.secondDay.registered }}{{ statistiques.secondDay.confirmed }} - {% if statistiques.second_jour.en_attente_de_reglement == '' %} + {% if statistiques.secondDay.pending == '' %} 0 {% else %} - {{ statistiques.second_jour.en_attente_de_reglement }} + {{ statistiques.secondDay.pending }} {% endif %}
{% if inscription.date > 0 %}{{ inscription.date|date("d/m/Y H:m:s") }}{% endif %}{% if inscription.date > 0 %}{{ inscription.date|date("d/m/Y H:i:s") }}{% endif %} {{ inscription.prenom }} {{ inscription.nom }} {% if inscription.type_reglement == 0 %}CB{% elseif inscription.type_reglement == 1 %}CHQ{% elseif inscription.type_reglement == 2 %}VIR{% endif %} Non trouvée A expiré le {{ inscription.lastsubscription|date('d/m/Y') }}