diff --git a/app/config/services.yml b/app/config/services.yml index cc041f444..270bb5831 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -172,6 +172,7 @@ services: Afup\Site\Association\Cotisations: factory: ['@Afup\Site\Association\CotisationsFactory', 'create'] + lazy: true Afup\Site\Comptabilite\Comptabilite: autowire: true diff --git a/composer.json b/composer.json index 6d6e0e5e1..004c2eb2e 100644 --- a/composer.json +++ b/composer.json @@ -113,8 +113,8 @@ "PlanetePHP\\": "sources/PlanetePHP/" }, "files": [ - "sources/Afup/Bootstrap/_Common.php", - "sources/Afup/Bootstrap/commonStart.php" + "sources/Afup/Bootstrap/constants.php", + "sources/Afup/fonctions.php" ] }, "autoload-dev": { diff --git a/sources/Afup/Bootstrap/Cli.php b/sources/Afup/Bootstrap/Cli.php index fbeaf2b98..bdd5dae1a 100644 --- a/sources/Afup/Bootstrap/Cli.php +++ b/sources/Afup/Bootstrap/Cli.php @@ -24,7 +24,7 @@ $startMicrotime = microtime(true); -require_once __DIR__ . '/_Common.php'; require_once __DIR__ . '/../../../vendor/autoload.php'; +require_once __DIR__ . '/_Common.php'; Logs::initialiser($bdd, 0); diff --git a/sources/Afup/Bootstrap/Http.php b/sources/Afup/Bootstrap/Http.php index 562c85a77..a843eb459 100644 --- a/sources/Afup/Bootstrap/Http.php +++ b/sources/Afup/Bootstrap/Http.php @@ -25,6 +25,7 @@ use Afup\Site\Corporate\Site; use Smarty\Smarty; +require_once __DIR__ . '/../../../vendor/autoload.php'; require_once __DIR__ . '/_Common.php'; // initialisation de la session / requête diff --git a/sources/Afup/Bootstrap/_Common.php b/sources/Afup/Bootstrap/_Common.php index 3a00b18d0..2e6a656cb 100644 --- a/sources/Afup/Bootstrap/_Common.php +++ b/sources/Afup/Bootstrap/_Common.php @@ -23,19 +23,8 @@ use Afup\Site\Corporate\_Site_Base_De_Donnees; use Afup\Site\Utils\Configuration; -$root = dirname(__DIR__, 3); - -require_once $root . '/vendor/autoload.php'; - -// définitions des constantes -if (!defined('AFUP_CHEMIN_RACINE')) { - define('AFUP_CHEMIN_RACINE', $root . '/htdocs/'); -} date_default_timezone_set('Europe/Paris'); -// préparation de la requête / session -require_once __DIR__ . '/../fonctions.php'; - // chargement de la configuration $conf = new Configuration(); diff --git a/sources/Afup/Bootstrap/commonStart.php b/sources/Afup/Bootstrap/commonStart.php index 39bf1bac5..164e7761a 100644 --- a/sources/Afup/Bootstrap/commonStart.php +++ b/sources/Afup/Bootstrap/commonStart.php @@ -2,7 +2,6 @@ declare(strict_types=1); -use AppBundle\Event\Model\Ticket; use CCMBenchmark\Ting\Services; use Symfony\Component\Security\Csrf\CsrfTokenManager; use Symfony\Component\Translation\Loader\XliffFileLoader; @@ -32,99 +31,6 @@ $debug = true; } -define('AFUP_COTISATION_PERSONNE_PHYSIQUE', 30); -define('AFUP_COTISATION_PERSONNE_MORALE', 150); -define('AFUP_PERSONNE_MORALE_SEUIL', 3); - -define('AFUP_RAISON_SOCIALE', 'AFUP'); -define('AFUP_ADRESSE', "32, Boulevard de Strasbourg\nCS 30108"); -define('AFUP_CODE_POSTAL', '75468'); -define('AFUP_VILLE', 'Paris Cedex 10'); -define('AFUP_EMAIL', 'bureau@afup.org'); -define('AFUP_SIRET', '500 869 011 00022'); -define('AFUP_NUMERO_TVA', 'FR27 500 869 011'); - -// Ticket transport distance -define('AFUP_TRANSPORT_DISTANCE_0', 0); -define('AFUP_TRANSPORT_DISTANCE_25_50', 25); -define('AFUP_TRANSPORT_DISTANCE_50_100', 50); -define('AFUP_TRANSPORT_DISTANCE_100_500', 100); -define('AFUP_TRANSPORT_DISTANCE_500_1000', 500); -define('AFUP_TRANSPORT_DISTANCE_1000', 1000); - -// Ticket transport mode -define('AFUP_TRANSPORT_MODE_SEUL_THERMIQUE', 10); -define('AFUP_TRANSPORT_MODE_SEUL_ELECTRIQUE', 20); -define('AFUP_TRANSPORT_MODE_SEUL_HYBRIDE', 30); -define('AFUP_TRANSPORT_MODE_PASSAGERS_THERMIQUE', 40); -define('AFUP_TRANSPORT_MODE_PASSAGERS_ELECTRIQUE', 50); -define('AFUP_TRANSPORT_MODE_PASSAGERS_HYBRIDE', 60); -define('AFUP_TRANSPORT_MODE_BUS', 70); -define('AFUP_TRANSPORT_MODE_TRAIN', 80); -define('AFUP_TRANSPORT_MODE_AVION_ECO', 90); -define('AFUP_TRANSPORT_MODE_AVION_BUSINESS', 100); -define('AFUP_TRANSPORT_MODE_COMMUN', 110); - -$AFUP_Tarifs_Forum = [ - Ticket::TYPE_INVITATION => 0, - Ticket::TYPE_ORGANIZATION => 0, - Ticket::TYPE_SPONSOR => 0, - Ticket::TYPE_PRESS => 0, - Ticket::TYPE_SPEAKER => 0, - Ticket::TYPE_PROJECT => 0, - Ticket::TYPE_TEACHER => 0, - Ticket::TYPE_DAY_1 => 150, - Ticket::TYPE_DAY_2 => 150, - Ticket::TYPE_2_DAYS => 250, - Ticket::TYPE_2_DAYS_AFUP => 150, - Ticket::TYPE_DAY_1_AFUP => 100, - Ticket::TYPE_DAY_2_AFUP => 100, - Ticket::TYPE_2_DAYS_STUDENT => 150, - Ticket::TYPE_DAY_1_STUDENT => 100, - Ticket::TYPE_DAY_2_STUDENT => 100, - Ticket::TYPE_2_DAYS_EARLY => 150, - Ticket::TYPE_2_DAYS_AFUP_EARLY => 150, - Ticket::TYPE_EARLY_PLUS_MEMBERSHIP => 150, - Ticket::TYPE_DAY_1_STUDENT_EARLY => 100, - Ticket::TYPE_DAY_2_STUDENT_EARLY => 100, - Ticket::TYPE_2_DAYS_STUDENT_EARLY => 150, - Ticket::TYPE_2_DAYS_VOUCHER => 200, - Ticket::TYPE_2_DAYS_SPONSOR => 200, - Ticket::TYPE_SPECIAL_PRICE => 0, -]; - -$GLOBALS['AFUP_Tarifs_Forum'] = $AFUP_Tarifs_Forum; - -$AFUP_Tarifs_Forum_Lib = [ - Ticket::TYPE_INVITATION => 'Invitation', - Ticket::TYPE_ORGANIZATION => 'Organisation', - Ticket::TYPE_PROJECT => 'Projet PHP', - Ticket::TYPE_SPONSOR => 'Sponsor', - Ticket::TYPE_PRESS => 'Presse', - Ticket::TYPE_TEACHER => 'Enseignement supérieur', - Ticket::TYPE_SPEAKER => 'Conferencier', - Ticket::TYPE_DAY_1 => 'Jour 1 ', - Ticket::TYPE_DAY_2 => 'Jour 2', - Ticket::TYPE_2_DAYS => '2 Jours', - Ticket::TYPE_2_DAYS_AFUP => '2 Jours AFUP', - Ticket::TYPE_DAY_1_AFUP => 'Jour 1 AFUP', - Ticket::TYPE_DAY_2_AFUP => 'Jour 2 AFUP', - Ticket::TYPE_2_DAYS_STUDENT => '2 Jours Etudiant', - Ticket::TYPE_DAY_1_STUDENT => 'Jour 1 Etudiant', - Ticket::TYPE_DAY_2_STUDENT => 'Jour 2 Etudiant', - Ticket::TYPE_2_DAYS_EARLY => '2 Jours prévente', - Ticket::TYPE_2_DAYS_AFUP_EARLY => '2 Jours AFUP prévente', - Ticket::TYPE_EARLY_PLUS_MEMBERSHIP => '2 Jours prévente + adhésion', - Ticket::TYPE_2_DAYS_STUDENT_EARLY => '2 Jours Etudiant prévente', - Ticket::TYPE_2_DAYS_VOUCHER => '2 Jours avec coupon de réduction', - Ticket::TYPE_2_DAYS_SPONSOR => '2 Jours par Sponsor', - Ticket::TYPE_DAY_1_STUDENT_EARLY => '', - Ticket::TYPE_DAY_2_STUDENT_EARLY => '', - Ticket::TYPE_SPECIAL_PRICE => 'Tarif Spécial', -]; - -$GLOBALS['AFUP_Tarifs_Forum_Lib'] = $AFUP_Tarifs_Forum_Lib; - // Initialisation de ting $services = new Services(); diff --git a/sources/Afup/Bootstrap/constants.php b/sources/Afup/Bootstrap/constants.php new file mode 100644 index 000000000..f16ff951e --- /dev/null +++ b/sources/Afup/Bootstrap/constants.php @@ -0,0 +1,104 @@ + 0, + Ticket::TYPE_ORGANIZATION => 0, + Ticket::TYPE_SPONSOR => 0, + Ticket::TYPE_PRESS => 0, + Ticket::TYPE_SPEAKER => 0, + Ticket::TYPE_PROJECT => 0, + Ticket::TYPE_TEACHER => 0, + Ticket::TYPE_DAY_1 => 150, + Ticket::TYPE_DAY_2 => 150, + Ticket::TYPE_2_DAYS => 250, + Ticket::TYPE_2_DAYS_AFUP => 150, + Ticket::TYPE_DAY_1_AFUP => 100, + Ticket::TYPE_DAY_2_AFUP => 100, + Ticket::TYPE_2_DAYS_STUDENT => 150, + Ticket::TYPE_DAY_1_STUDENT => 100, + Ticket::TYPE_DAY_2_STUDENT => 100, + Ticket::TYPE_2_DAYS_EARLY => 150, + Ticket::TYPE_2_DAYS_AFUP_EARLY => 150, + Ticket::TYPE_EARLY_PLUS_MEMBERSHIP => 150, + Ticket::TYPE_DAY_1_STUDENT_EARLY => 100, + Ticket::TYPE_DAY_2_STUDENT_EARLY => 100, + Ticket::TYPE_2_DAYS_STUDENT_EARLY => 150, + Ticket::TYPE_2_DAYS_VOUCHER => 200, + Ticket::TYPE_2_DAYS_SPONSOR => 200, + Ticket::TYPE_SPECIAL_PRICE => 0, +]; + +$GLOBALS['AFUP_Tarifs_Forum'] = $AFUP_Tarifs_Forum; + +$AFUP_Tarifs_Forum_Lib = [ + Ticket::TYPE_INVITATION => 'Invitation', + Ticket::TYPE_ORGANIZATION => 'Organisation', + Ticket::TYPE_PROJECT => 'Projet PHP', + Ticket::TYPE_SPONSOR => 'Sponsor', + Ticket::TYPE_PRESS => 'Presse', + Ticket::TYPE_TEACHER => 'Enseignement supérieur', + Ticket::TYPE_SPEAKER => 'Conferencier', + Ticket::TYPE_DAY_1 => 'Jour 1 ', + Ticket::TYPE_DAY_2 => 'Jour 2', + Ticket::TYPE_2_DAYS => '2 Jours', + Ticket::TYPE_2_DAYS_AFUP => '2 Jours AFUP', + Ticket::TYPE_DAY_1_AFUP => 'Jour 1 AFUP', + Ticket::TYPE_DAY_2_AFUP => 'Jour 2 AFUP', + Ticket::TYPE_2_DAYS_STUDENT => '2 Jours Etudiant', + Ticket::TYPE_DAY_1_STUDENT => 'Jour 1 Etudiant', + Ticket::TYPE_DAY_2_STUDENT => 'Jour 2 Etudiant', + Ticket::TYPE_2_DAYS_EARLY => '2 Jours prévente', + Ticket::TYPE_2_DAYS_AFUP_EARLY => '2 Jours AFUP prévente', + Ticket::TYPE_EARLY_PLUS_MEMBERSHIP => '2 Jours prévente + adhésion', + Ticket::TYPE_2_DAYS_STUDENT_EARLY => '2 Jours Etudiant prévente', + Ticket::TYPE_2_DAYS_VOUCHER => '2 Jours avec coupon de réduction', + Ticket::TYPE_2_DAYS_SPONSOR => '2 Jours par Sponsor', + Ticket::TYPE_DAY_1_STUDENT_EARLY => '', + Ticket::TYPE_DAY_2_STUDENT_EARLY => '', + Ticket::TYPE_SPECIAL_PRICE => 'Tarif Spécial', +]; + +$GLOBALS['AFUP_Tarifs_Forum_Lib'] = $AFUP_Tarifs_Forum_Lib; diff --git a/sources/AppBundle/Controller/LegacyController.php b/sources/AppBundle/Controller/LegacyController.php index 093e0e4af..35620cbbd 100644 --- a/sources/AppBundle/Controller/LegacyController.php +++ b/sources/AppBundle/Controller/LegacyController.php @@ -59,6 +59,9 @@ public function void() public function backOffice() { + require_once __DIR__ . '/../../Afup/Bootstrap/_Common.php'; + require_once __DIR__ . '/../../Afup/Bootstrap/commonStart.php'; + /** * All global variables (as defined in commonStart and others) should be declared here */