Skip to content

Fusion des constantes du status d'un event #2069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mopolo merged 1 commit into from
Dec 31, 2025
Merged

Fusion des constantes du status d'un event #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions db/seeds/Inscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

declare(strict_types=1);

use AppBundle\Event\Model\Ticket;
use Phinx\Seed\AbstractSeed;

class Inscriptions extends AbstractSeed
Expand All @@ -23,7 +24,7 @@ public function run(): void
'newsletter_afup' => '1',
'newsletter_nexen' => '0',
'id_forum' => Event::ID_FORUM,
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
],
[
'reference' => 'REF-TEST-002',
Expand All @@ -38,7 +39,7 @@ public function run(): void
'newsletter_afup' => '1',
'newsletter_nexen' => '0',
'id_forum' => Event::ID_FORUM,
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
],
[
'reference' => 'REF-TEST-003',
Expand All @@ -53,7 +54,7 @@ public function run(): void
'newsletter_afup' => '1',
'newsletter_nexen' => '0',
'id_forum' => Event::ID_FORUM,
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
],
];

Expand Down Expand Up @@ -81,7 +82,7 @@ public function run(): void
'id_pays' => 'FR',
'autorisation' => 'otzbfksgve',
'transaction' => 'taedsken',
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
'facturation' => 0,
'id_forum' => Event::ID_FORUM,
'date_facture' => time(),
Expand All @@ -100,7 +101,7 @@ public function run(): void
'id_pays' => 'FR',
'autorisation' => 'otzbfksgvz',
'transaction' => 'taedskem',
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
'facturation' => 1,
'id_forum' => Event::ID_FORUM,
'date_facture' => (new \DateTime("2023-06-25"))->getTimestamp(),
Expand All @@ -119,7 +120,7 @@ public function run(): void
'id_pays' => 'FR',
'autorisation' => 'ozzbfksgvz',
'transaction' => 'yaedskem',
'etat' => AFUP_FORUM_ETAT_REGLE,
'etat' => Ticket::STATUS_PAID,
'facturation' => 1,
'id_forum' => Event::ID_FORUM,
'date_facture' => (new \DateTime("2024-01-02"))->getTimestamp(),
Expand Down
19 changes: 10 additions & 9 deletions htdocs/pages/administration/forum_inscriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,16 @@ function updateGlobalsForTarif(
$formulaire->addElement('text' , 'autorisation', 'Autorisation', ['size' => 50, 'maxlength' => 100]);
$formulaire->addElement('text' , 'transaction' , 'Transaction' , ['size' => 50, 'maxlength' => 100]);

$state = [AFUP_FORUM_ETAT_CREE => 'Inscription créée',
AFUP_FORUM_ETAT_ANNULE => 'Inscription annulée',
AFUP_FORUM_ETAT_ERREUR => 'Paiement CB erreur',
AFUP_FORUM_ETAT_REFUSE => 'Paiement CB refusé',
AFUP_FORUM_ETAT_REGLE => 'Inscription réglée',
AFUP_FORUM_ETAT_INVITE => 'Invitation',
AFUP_FORUM_ETAT_ATTENTE_REGLEMENT => 'Attente règlement',
AFUP_FORUM_ETAT_CONFIRME => 'Inscription confirmée',
AFUP_FORUM_ETAT_A_POSTERIORI => 'Inscription à posteriori',
$state = [
Ticket::STATUS_CREATED => 'Inscription créée',
Ticket::STATUS_CANCELLED => 'Inscription annulée',
Ticket::STATUS_ERROR => 'Paiement CB erreur',
Ticket::STATUS_DECLINED => 'Paiement CB refusé',
Ticket::STATUS_PAID => 'Inscription réglée',
Ticket::STATUS_GUEST => 'Invitation',
Ticket::STATUS_WAITING => 'Attente règlement',
Ticket::STATUS_CONFIRMED => 'Inscription confirmée',
Ticket::STATUS_PAID_AFTER => 'Inscription à posteriori',
];
$formulaire->addElement('select', 'etat' , 'Etat' , $state);

Expand Down
10 changes: 0 additions & 10 deletions sources/Afup/Bootstrap/commonStart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@
$debug = true;
}

define('AFUP_FORUM_ETAT_CREE', 0);
define('AFUP_FORUM_ETAT_ANNULE', 1);
define('AFUP_FORUM_ETAT_ERREUR', 2);
define('AFUP_FORUM_ETAT_REFUSE', 3);
define('AFUP_FORUM_ETAT_REGLE', 4);
define('AFUP_FORUM_ETAT_INVITE', 5);
define('AFUP_FORUM_ETAT_ATTENTE_REGLEMENT', 6);
define('AFUP_FORUM_ETAT_CONFIRME', 7);
define('AFUP_FORUM_ETAT_A_POSTERIORI', 8);

define('AFUP_FORUM_FACTURE_A_ENVOYER', 0);
define('AFUP_FORUM_FACTURE_ENVOYEE', 1);
define('AFUP_FORUM_FACTURE_RECUE', 2);
Expand Down
2 changes: 1 addition & 1 deletion sources/Afup/Forum/Facturation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function obtenirListe($id_forum = null,
$requete .= ' ' . $champs . ' ';
$requete .= 'FROM';
$requete .= ' afup_facturation_forum ';
$requete .= 'WHERE etat IN ( ' . AFUP_FORUM_ETAT_REGLE . ', ' . AFUP_FORUM_ETAT_ATTENTE_REGLEMENT . ', ' . AFUP_FORUM_ETAT_CONFIRME . ') ';
$requete .= 'WHERE etat IN ( ' . Ticket::STATUS_PAID . ', ' . Ticket::STATUS_WAITING . ', ' . Ticket::STATUS_CONFIRMED . ') ';
$requete .= ' AND id_forum =' . $id_forum . ' ';
if ($filtre) {
$requete .= ' AND (societe LIKE \'%' . $filtre . '%\' OR reference LIKE \'%' . $filtre . '%\' ) ';
Expand Down
13 changes: 7 additions & 6 deletions sources/AppBundle/Event/Model/Repository/EventStatsRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use AppBundle\Event\Model\EventStats\TicketTypeStats;
use AppBundle\Event\Model\EventStats;
use AppBundle\Event\Model\EventStats\DailyStats;
use AppBundle\Event\Model\Ticket;
use Assert\Assertion;
use Datetime;
use Doctrine\DBAL\ArrayParameterType;
Expand Down Expand Up @@ -52,7 +53,7 @@ public function getStatsForTicketTypes(int $eventId, ?Datetime $from): TicketTyp

$queryBuilder = clone $baseQueryBuilder;
$statement = $queryBuilder->andWhere('etat IN(:states)')
->setParameter('states', [AFUP_FORUM_ETAT_REGLE, AFUP_FORUM_ETAT_ATTENTE_REGLEMENT, AFUP_FORUM_ETAT_INVITE], ArrayParameterType::INTEGER)
->setParameter('states', [Ticket::STATUS_PAID, Ticket::STATUS_WAITING, Ticket::STATUS_GUEST], ArrayParameterType::INTEGER)
->executeQuery();

$confirmed = [];
Expand All @@ -62,7 +63,7 @@ public function getStatsForTicketTypes(int $eventId, ?Datetime $from): TicketTyp

$queryBuilder = clone $baseQueryBuilder;
$statement = $queryBuilder->andWhere('etat IN(:states)')
->setParameter('states', [AFUP_FORUM_ETAT_REGLE, AFUP_FORUM_ETAT_ATTENTE_REGLEMENT], ArrayParameterType::INTEGER)
->setParameter('states', [Ticket::STATUS_PAID, Ticket::STATUS_WAITING], ArrayParameterType::INTEGER)
->executeQuery();

$paying = [];
Expand All @@ -72,7 +73,7 @@ public function getStatsForTicketTypes(int $eventId, ?Datetime $from): TicketTyp

$queryBuilder = clone $baseQueryBuilder;
$statement = $queryBuilder->andWhere('etat NOT IN(:states)')
->setParameter('states', [AFUP_FORUM_ETAT_ANNULE, AFUP_FORUM_ETAT_ERREUR, AFUP_FORUM_ETAT_REFUSE], ArrayParameterType::INTEGER)
->setParameter('states', [Ticket::STATUS_CANCELLED, Ticket::STATUS_ERROR, Ticket::STATUS_DECLINED], ArrayParameterType::INTEGER)
->executeQuery();

$registered = [];
Expand Down Expand Up @@ -101,19 +102,19 @@ private function getStatsForDay(int $eventId, string $day, ?Datetime $from = nul

$queryBuilder = clone $baseQueryBuilder;
$registered = $queryBuilder->andWhere('etat NOT IN(:states)')
->setParameter('states', [AFUP_FORUM_ETAT_ANNULE, AFUP_FORUM_ETAT_ERREUR, AFUP_FORUM_ETAT_REFUSE], ArrayParameterType::INTEGER)
->setParameter('states', [Ticket::STATUS_CANCELLED, Ticket::STATUS_ERROR, Ticket::STATUS_DECLINED], ArrayParameterType::INTEGER)
->executeQuery()
->fetchOne();

$queryBuilder = clone $baseQueryBuilder;
$confirmed = $queryBuilder->andWhere('etat IN(:states)')
->setParameter('states', [AFUP_FORUM_ETAT_REGLE, AFUP_FORUM_ETAT_INVITE, AFUP_FORUM_ETAT_CONFIRME], ArrayParameterType::INTEGER)
->setParameter('states', [Ticket::STATUS_PAID, Ticket::STATUS_GUEST, Ticket::STATUS_CONFIRMED], ArrayParameterType::INTEGER)
->executeQuery()
->fetchOne();

$queryBuilder = clone $baseQueryBuilder;
$pending = $queryBuilder->andWhere('etat = :state')
->setParameter('state', AFUP_FORUM_ETAT_ATTENTE_REGLEMENT)
->setParameter('state', Ticket::STATUS_WAITING)
->executeQuery()
->fetchOne();

Expand Down
18 changes: 9 additions & 9 deletions sources/AppBundle/Event/Model/Ticket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ class Ticket implements NotifyPropertyInterface
AFUP_TRANSPORT_DISTANCE_1000 => '> 1000 km',
];

public const STATUS_CREATED = AFUP_FORUM_ETAT_CREE;
public const STATUS_CANCELLED = AFUP_FORUM_ETAT_ANNULE;
public const STATUS_ERROR = AFUP_FORUM_ETAT_ERREUR;
public const STATUS_DECLINED = AFUP_FORUM_ETAT_REFUSE;
public const STATUS_PAID = AFUP_FORUM_ETAT_REGLE;
public const STATUS_GUEST = AFUP_FORUM_ETAT_INVITE;
public const STATUS_WAITING = AFUP_FORUM_ETAT_ATTENTE_REGLEMENT;
public const STATUS_CONFIRMED = AFUP_FORUM_ETAT_CONFIRME; // Je ne comprends pas ce que veut dire ce statut @todo check & delete
public const STATUS_PAID_AFTER = AFUP_FORUM_REGLEMENT_A_POSTERIORI; // Je ne comprends pas l'intéret @todo check & delete
public const STATUS_CREATED = 0;
public const STATUS_CANCELLED = 1;
public const STATUS_ERROR = 2;
public const STATUS_DECLINED = 3;
public const STATUS_PAID = 4;
public const STATUS_GUEST = 5;
public const STATUS_WAITING = 6;
public const STATUS_CONFIRMED = 7;
public const STATUS_PAID_AFTER = 8;

public const INVOICE_TODO = AFUP_FORUM_FACTURE_A_ENVOYER;
public const INVOICE_SENT = AFUP_FORUM_FACTURE_ENVOYEE;
Expand Down