diff --git a/config.json b/config.json
index c24a1cf..59b6ce7 100644
--- a/config.json
+++ b/config.json
@@ -1,8 +1,17 @@
{
"articlesCGI" : [
- "Article 200",
- "Article 228 bis",
- "Article 978"
+ {
+ "titre" : "Article 200",
+ "valeur" : 0
+ },
+ {
+ "titre" : "Article 228 bis",
+ "valeur" : 0
+ },
+ {
+ "titre" : "Article 978",
+ "valeur" : 0
+ }
],
"reduction" : [
{
diff --git a/templates/config.tpl b/templates/config.tpl
index 3728eea..fef9049 100644
--- a/templates/config.tpl
+++ b/templates/config.tpl
@@ -13,28 +13,30 @@
+
\ No newline at end of file
diff --git a/templates/index.tpl b/templates/index.tpl
index 2dbab8f..206d592 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -78,12 +78,12 @@
+ name="taux_reduction_{$activite.idTarif}" value="{$plugin_config->reduction[0]->taux}" disabled />
normal
+ name="taux_reduction_{$activite.idTarif}" value="{$plugin_config->reduction[1]->taux}" disabled />
majoré
diff --git a/www/admin/config.php b/www/admin/config.php
index 494046c..43c7d7e 100644
--- a/www/admin/config.php
+++ b/www/admin/config.php
@@ -3,16 +3,24 @@
namespace Garradin;
$session->requireAccess($session::SECTION_CONFIG, $session::ACCESS_ADMIN);
-
+$art_sel=f('articlesCGI');
+error_log("art sel=" . print_r($art_sel, true) . "\n");
if (f('save') && $form->check('recusfiscaux_config'))
{
try {
- $plugin->setConfig('objet_0', trim(f('objet_0')));
- $plugin->setConfig('objet_1', trim(f('objet_1')));
- $plugin->setConfig('objet_2', trim(f('objet_2')));;
- $plugin->setConfig('cgi_art1', (bool)f('cgi_art_1'));
- $plugin->setConfig('cgi_art2', (bool)f('cgi_art_2'));
- $plugin->setConfig('cgi_art3', (bool)f('cgi_art_3'));
+ $plugin->setConfig('objet_asso', trim(f('objet_asso')));
+ $confArticles = $plugin->getConfig('articlesCGI');
+ // effacer l'ancienne configuration
+ for ($i = 0; $i < count($confArticles); ++$i) {
+ $confArticles[$i]->valeur = 0;
+ }
+ // et copier la nouvelle
+ foreach ($art_sel as $article) {
+ $confArticles[$article]->valeur = 1;
+ }
+ error_log("confArticles=" . print_r($confArticles, true) . "\n");
+ $plugin->setConfig("articlesCGI", $confArticles);
+ error_log("plugin->config=" . print_r($plugin->getConfig("articlesCGI"), true) . "\n");
\Garradin\Utils::redirect(PLUGIN_URL . 'config.php?ok');
}
catch (UserException $e)
diff --git a/www/admin/index.php b/www/admin/index.php
index e23f6a1..521bdea 100644
--- a/www/admin/index.php
+++ b/www/admin/index.php
@@ -21,6 +21,7 @@ $activitesTarifsComptes = Utils::getActivitesTarifsEtComptes();
$tpl->assign('anneesFiscales', $anneesFiscales);
$tpl->assign('anneeCourante', $anneeCourante);
$tpl->assign('activitesTarifsComptes', $activitesTarifsComptes);
+$tpl->assign('plugin_config', $plugin->getConfig());
$tpl->assign('plugin_css', ['style.css']);
// envoyer au template
diff --git a/www/admin/versements_activites.php b/www/admin/versements_activites.php
index d12b3a6..4dcc5db 100644
--- a/www/admin/versements_activites.php
+++ b/www/admin/versements_activites.php
@@ -4,9 +4,20 @@ namespace Garradin;
use Garradin\Plugin\RecusFiscaux\Utils;
-// récupérer les tarifs sélectionnés
+// récupérer les infos du formulaire
$lesTarifs = f('tarifs');
-$_SESSION['annee_recu'] = strip_tags($_POST['annee_recu']);
+$_SESSION['annee_recu'] = f('annee_recu');
+
+// taux de réduction associés
+$lesTaux = array();
+foreach ($lesTarifs as $idTarif) {
+ $nomRadio = "taux_reduction_" . $idTarif;
+ $valRadio = f("$nomRadio");
+ $lesTaux[] = $valRadio ? $valRadio: $plugin->getConfig()->reduction[0]->taux;
+}
+// error_log("Tarifs = " . print_r($lesTarifs, true) . "\n");
+// error_log("Réducs = " . print_r($lesTaux, true) . "\n");
+
// liste des versements correspondants
$_SESSION['lesVersements'] = Utils::getVersementsActivite($_SESSION['annee_recu'], $lesTarifs);
diff --git a/www/admin/versements_personnes.php b/www/admin/versements_personnes.php
index 259197a..adabb18 100644
--- a/www/admin/versements_personnes.php
+++ b/www/admin/versements_personnes.php
@@ -5,7 +5,7 @@ namespace Garradin;
use Garradin\Plugin\RecusFiscaux\Utils;
// liste des versements totaux par personne
-$_SESSION['annee_recu'] = strip_tags($_POST['annee_recu']);
+$_SESSION['annee_recu'] = f('annee_recu');
$_SESSION['lesVersementsTotaux'] = Utils::getVersementsTotaux($_SESSION['annee_recu']);
// préparation de l'affichage