feature/move-inscription-page-to-sf : Fait un peu de ménage dans le code rapidement + remplace les liens par la fonction path de twig + corrige un bug quand on tente de générer une inscription pour une personne

Author: Raphael

htdocs/pages/administration/forum_inscriptions.php

@@ -161,7 +161,7 @@ function updateGlobalsForTarif(
         'telephone_portable' => $champs['telephone'],
         'etat' => 1,
     ]);
-    afficherMessage("L'inscription a été pré-remplie\nPensez à générer le login",  $urlGenerator->generate('admin_members_add'));
+    afficherMessage("L'inscription a été pré-remplie\nPensez à générer le login",  $urlGenerator->generate('admin_members_user_add'));
 } else {
     $pays = new Pays($bdd);
 

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,21 +133,21 @@ 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) {
             /**
              * @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);
+            $remainingTickets[$ticketType->getTicketTypeId()] = $ticketTypeAvailability->getStock($ticketType, $event);
 
             if ($ticketType->getTicketType()->getIsRestrictedToMembers()) {
                 $membersTickets[] = $ticketType->getTicketTypeId();
             }
         }
 
-        return ['restantes' => $AFUP_Tarifs_Forum_Restantes];
+        return $remainingTickets;
     }
 }

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) {

templates/event/inscription/list.html.twig

@@ -6,7 +6,7 @@
     {% include 'admin/event/change_event.html.twig' with {form: event_select_form} only %}
 
     <div class="ui menu">
-        <a href="/pages/administration/index.php?page=forum_inscriptions&amp;action=ajouter&amp;id_forum={{ event.id }}" class="item">
+        <a href="/pages/administration/index.php?page=forum_inscriptions&action=ajouter&id_forum={{ event.id }}" class="item">
             <div data-tooltip="Ajouter une inscription" data-position="bottom left">
                 <i class="icon plus square"></i>
                 Ajouter
@@ -17,8 +17,8 @@
             <span class="text">Exports</span>
             <i class="dropdown icon"></i>
             <div class="menu hidden" tabindex="-1">
-                <a class="item" href="/admin/event/badges?id={{ event.id }}" title="Exporter les inscriptions pour les badges">Exporter les inscriptions pour les badges <i>(prends environ une minute)</a></i>
-                <a class="item" href="/admin/event/previous_registrations?event_count=4">Exporter les inscrits aux 4 derniers évènements <i>(ayant acceptés d'être contactés, et pour les évènements passés)</i></a>
+                <a class="item" href="{{ path('admin_event_badges', {id: event.id}) }}" title="Exporter les inscriptions pour les badges">Exporter les inscriptions pour les badges <i>(prends environ une minute)</a></i>
+                <a class="item" href="{{ path('admin_event_previous_registrations', {event_count: 4}) }}">Exporter les inscrits aux 4 derniers évènements <i>(ayant acceptés d'être contactés, et pour les évènements passés)</i></a>
             </div>
         </div>
 
@@ -63,7 +63,7 @@
                         <td class="right aligned">{{ confirmes }}</td>
                         <td class="right aligned">{{ payants }}</td>
                         <td class="right aligned"> {{ montant }}</td>
-                        <td class="right aligned"> {{ restantes[forumTarifKey]|default('') }}</td>
+                        <td class="right aligned"> {{ remainingTickets[forumTarifKey]|default('') }}</td>
 
                     </tr>
                 {% endif %}
@@ -143,23 +143,23 @@
                 <tr>
                     <th align="left"><a href="{{ path('admin_event_inscription_list', app.request.query.all|merge({
                             sort: 'date',
-                            direction: direction == 'asc' and sort == 'name' ? 'desc' : 'asc'
+                            direction: direction == 'asc' and sort == 'date' ? 'desc' : 'asc'
                         })) }}">Date</a></th>
                     <th align="left"><a href="{{ path('admin_event_inscription_list', app.request.query.all|merge({
                             sort: 'name',
                             direction: direction == 'asc' and sort == 'name' ? 'desc' : 'asc'
                         })) }}">Nom Prénom</a></th>
                     <th align="left"><a href="{{ path('admin_event_inscription_list', app.request.query.all|merge({
                             sort: 'societe',
-                            direction: direction == 'asc' and sort == 'name' ? 'desc' : 'asc'
+                            direction: direction == 'asc' and sort == 'societe' ? 'desc' : 'asc'
                         })) }}">Société (facturation)</a></th>
                     <th align="left"><a href="{{ path('admin_event_inscription_list', app.request.query.all|merge({
                             sort: 'type',
-                            direction: direction == 'asc' and sort == 'name' ? 'desc' : 'asc'
+                            direction: direction == 'asc' and sort == 'type' ? 'desc' : 'asc'
                         })) }}">Type</a></th>
                     <th><a href="{{ path('admin_event_inscription_list', app.request.query.all|merge({
                             sort: 'etat',
-                            direction: direction == 'asc' and sort == 'name' ? 'desc' : 'asc'
+                            direction: direction == 'asc' and sort == 'etat' ? 'desc' : 'asc'
                         })) }}">Etat</a></th>
                     <th align="left">Règ.</th>
                     <th title="Applicable uniquement aux tarifs afup">Statut cotisation</th>
@@ -172,7 +172,7 @@
                     <td nowrap="nowrap">{% if inscription.date.timestamp is defined %}{{ inscription.date|date("d/m/Y H:m:s")}}{% endif %}</td>
                     <td>
                         <strong>{{ inscription.prenom }} {{ inscription.nom }}</strong>
-                        <a href="/admin/members/users?filter={{ inscription.nom }} {{ inscription.email }}"
+                        <a href="{{ path('admin_members_user_list', {'filter': inscription.nom~' '~inscription.email}) }}"
                            data-position="right center"
                            data-tooltip="Rechercher dans les membres"
                            class="compact ui icon mini button"
@@ -183,7 +183,7 @@
                     <td>
                         {{ inscription.societe }}
                         {% if inscription.societe %}
-                            <a href="/admin/members/companies?filter={{ inscription.societe }}"
+                            <a href="{{ path('admin_members_company_list', {'filter': inscription.societe}) }}"
                                data-position="right center"
                                data-tooltip="Rechercher dans les personnes morales"
                                class="compact ui icon mini button"
@@ -251,18 +251,18 @@
                     <td style="text-align: right" nowrap="nowrap">
                         {% if inscription.type_inscription == constant('AFUP_FORUM_2_JOURNEES_PREVENTE_ADHESION') and inscription.etat != 1%}
                             {# TODO RAPH "cheminTemplate" #}
-                            <a href="/pages/administration/index.php?page=forum_inscriptions&amp;action=generer_mail_inscription_afup&amp;id={{ inscription.id }}"><img src="{$chemin_template}images/famfamfam/email_edit.png" alt="Générer un mail pour demander la confirmation d'adhésion à l'AFUP" /></a>
-                            <a href="/pages/administration/index.php?page=forum_inscriptions&amp;action=generer_inscription_afup&amp;id={{ inscription.id }}"><img src="{$chemin_template}images/famfamfam/group_add.png" alt="Transformer en adhésion AFUP" /></a>
+                            <a href="/pages/administration/index.php?page=forum_inscriptions&action=generer_mail_inscription_afup&id={{ inscription.id }}"><img src="{$chemin_template}images/famfamfam/email_edit.png" alt="Générer un mail pour demander la confirmation d'adhésion à l'AFUP" /></a>
+                            <a href="/pages/administration/index.php?page=forum_inscriptions&action=generer_inscription_afup&id={{ inscription.id }}"><img src="{$chemin_template}images/famfamfam/group_add.png" alt="Transformer en adhésion AFUP" /></a>
                         {% endif %}
-                        <a href="/pages/administration/index.php?page=forum_inscriptions&amp;action=modifier&amp;id={{ inscription.id }}"
+                        <a href="/pages/administration/index.php?page=forum_inscriptions&action=modifier&id={{ inscription.id }}"
                            data-position="left center"
                            data-tooltip="Modifier la fiche de {{ inscription.nom }} {{ inscription.prenom }}"
                            class="compact ui icon button"
                         >
                             <i class="pencil alernate icon"></i>
                         </a>
 
-                        <a href="/pages/administration/index.php?page=forum_inscriptions&amp;action=supprimer&amp;id={{ inscription.id }}"
+                        <a href="/pages/administration/index.php?page=forum_inscriptions&action=supprimer&id={{ inscription.id }}"
                            data-position="left center"
                            data-tooltip="Supprimer la fiche de {{ inscription.nom }} {{ inscription.prenom }}"
                            class="compact ui red icon button confirmable"