From 99c19878ae91d43f2dc416a009462a98a39bd146 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20T=C3=A9tard?= <olivier.tetard@miskin.fr>
Date: Sun, 6 Oct 2013 16:08:34 +0200
Subject: [PATCH] =?utf8?q?R=C3=A9cup=C3=A9ration=20des=20montants=20du=20f?=
 =?utf8?q?ormulaire=20souscription=20dans=20le=20code=20PHP.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 formulaires/souscription.html | 8 ++++----
 formulaires/souscription.php  | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/formulaires/souscription.html b/formulaires/souscription.html
index b6b405c..90d8a63 100644
--- a/formulaires/souscription.html
+++ b/formulaires/souscription.html
@@ -12,12 +12,12 @@
 
       #ACTION_FORMULAIRE{#ENV{action}}
       <ul>
-	[(#SAISIE{#CONFIG{souscription/#ENV{type_souscription}|concat{_type_saisie},input},
+	[(#SAISIE{#ENV{montant_type},
                   montant,
                   obligatoire=oui,
-                  label=[(#CONFIG{souscription/#ENV{type_souscription}|concat{_montants_label},<:souscription:label_montant:>})],
-                  explication=[(#CONFIG{souscription/#ENV{type_souscription}|concat{_montants_description}}|nl2br)],
-                  datas=#CONFIG{souscription/#ENV{type_souscription}|concat{_montants}}})]
+                  label=#ENV{montant_label},
+                  explication=#ENV{montant_explication},
+                  datas=#ENV{montant_datas}})]
    	[(#SAISIE{explication, dispositions_fiscales_explications, texte=#CONFIG{souscription/dispositions_fiscales_explications}|nl2br})]
 	[(#SAISIE{input, courriel, obligatoire=oui, label=<:souscription:label_courriel:>})]
 	[(#SAISIE{oui_non, recu_fiscal, label=<:souscription:label_recu_fiscal:>})]
diff --git a/formulaires/souscription.php b/formulaires/souscription.php
index f4aed27..d57b167 100644
--- a/formulaires/souscription.php
+++ b/formulaires/souscription.php
@@ -78,6 +78,11 @@ function formulaires_souscription_charger_dist($id_souscription_campagne) {
   if($type == "adhesion")
     $recu_fiscal = "on";
 
+  $montant_type = lire_config("souscription/{$type}_type_saisie", 'input');
+  $montant_datas = lire_config("souscription/${type}_montants", array());
+  $montant_label = lire_config("souscription/${type}_montants_label", _T('souscription:label_montant'));
+  $montant_explication = nl2br(lire_config("souscription/${type}_montants_description"));
+
   return array('montant' => '',
                'courriel' => '',
                'recu_fiscal' => $recu_fiscal,
@@ -92,6 +97,10 @@ function formulaires_souscription_charger_dist($id_souscription_campagne) {
                'telephone' => '',
                'id_souscription_campagne' => $id_souscription_campagne,
                'type_souscription' => $type,
+               'montant_datas' => $montant_datas,
+               'montant_type' => $montant_type,
+               'montant_label' => $montant_label,
+               'montant_explication' => $montant_explication
                );
 }
 
-- 
2.30.2