Ajout d'un champ « informer comité local » pour les adhésions

diff --git a/action/editer_souscription.php b/action/editer_souscription.php
index 095ff7c..5569492 100644 (file)
--- a/action/editer_souscription.php
+++ b/action/editer_souscription.php
@@ -63,6 +63,7 @@ function souscription_modifier($id_souscription, $set=false) {
                           array('courriel',
                                 'recu_fiscal',
                                 'envoyer_info',
+                                'informer_comite_local',
                                 'prenom',
                                 'nom',
                                 'adresse',

diff --git a/base/souscription.php b/base/souscription.php
index d20b75e..886663a 100644 (file)
--- a/base/souscription.php
+++ b/base/souscription.php
@@ -55,6 +55,7 @@ function souscription_declarer_tables_objets_sql($tables) {
                           "ville"               => "text NOT NULL DEFAULT ''",
                           "recu_fiscal"         => "varchar(3) NOT NULL DEFAULT ''",
                           "type_souscription"   => "varchar(255) NOT NULL DEFAULT ''",
+                          "informer_comite_local" => "varchar(3) NOT NULL DEFAULT ''",
                           "envoyer_info"        => "varchar(3) NOT NULL DEFAULT ''",
                           "date_souscription "  => "datetime NOT NULL DEFAULT '0000-00-00 00:00:00'",
                           "maj"                 => "TIMESTAMP"

diff --git a/formulaires/souscription.html b/formulaires/souscription.html
index aa86853..5a57173 100644 (file)
--- a/formulaires/souscription.html
+++ b/formulaires/souscription.html
@@ -10,6 +10,7 @@
        [(#SAISIE{input, montant, obligatoire=oui, label=<:souscription:label_montant:>})]
        [(#SAISIE{oui_non, recu_fiscal, label=<:souscription:label_recu_fiscal:>})]
         [(#SAISIE{oui_non, envoyer_info, label=<:souscription:label_envoyer_info:> })]
+        [(#ENV{type_souscription}|=={adhesion}|oui) [(#SAISIE{oui_non, informer_comite_local, label=<:souscription:label_informer_comite_local:> })]]
         [(#SAISIE{hidden, id_souscription_campagne})]
         [(#SAISIE{hidden, type_souscription})]
       </ul>

diff --git a/formulaires/souscription.php b/formulaires/souscription.php
index 91c0340..f08d461 100644 (file)
--- a/formulaires/souscription.php
+++ b/formulaires/souscription.php
@@ -82,6 +82,7 @@ function formulaires_souscription_charger_dist($id_souscription_campagne) {
                'courriel' => '',
                'recu_fiscal' => $recu_fiscal,
                'envoyer_info' => 'on',
+               'informer_comite_local' => 'on',
                'prenom' => '',
                'nom' => '',
                'adresse' => '',

diff --git a/lang/souscription_fr.php b/lang/souscription_fr.php
index df4b3fa..f45ed4c 100644 (file)
--- a/lang/souscription_fr.php
+++ b/lang/souscription_fr.php
@@ -53,6 +53,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
         'label_titre_campagne' => 'Titre de la campagne',
         'label_exporter_payes' => 'Exporter les dons payés',
         'label_exporter_tous' => 'Exporter tous les dons',
+        'label_informer_comite_local' => "Informer le comité local le plus proche",
 
        // R
        'retirer_lien_souscription' => 'Retirer ce don',

diff --git a/paquet.xml b/paquet.xml
index 86d3b40..7a57f57 100644 (file)
--- a/paquet.xml
+++ b/paquet.xml
@@ -6,7 +6,7 @@
     compatibilite="[3.0.5;3.0.*]"
     logo=""
     documentation=""
-    schema="0.0.3"
+    schema="0.1"
     >
 
   <nom>Souscription</nom>

diff --git a/prive/objets/contenu/souscription.html b/prive/objets/contenu/souscription.html
index 16bbb99..832525e 100644 (file)
--- a/prive/objets/contenu/souscription.html
+++ b/prive/objets/contenu/souscription.html
@@ -62,6 +62,11 @@
        <span dir="#LANG_DIR" class="#EDIT{envoyer_info} envoyer_info">(#ENVOYER_INFO|?{"oui","non"})</span>
 </div>]
 
+[<div class="champ contenu_informer_comite_local">
+       <label><:souscription:label_informer_comite_local:> : </label>
+       <span dir="#LANG_DIR" class="#EDIT{informer_comite_local} informer_comite_local">(#INFORMER_COMITE_LOCAL|?{"oui","non"})</span>
+</div>]
+
 </div>
 
 </BOUCLE_souscription>

diff --git a/souscription_administrations.php b/souscription_administrations.php
index 22888f3..2e18330 100644 (file)
--- a/souscription_administrations.php
+++ b/souscription_administrations.php
@@ -28,6 +28,7 @@ function souscription_upgrade($nom_meta_base_version, $version_cible) {
                                array('spip_souscriptions',
                                      'spip_souscription_campagnes',
                                      )));
+  $maj['0.1'] = array(array('sql_alter', "TABLE spip_souscriptions ADD informer_comite_local varchar(3) NOT NULL DEFAULT ''"));
 
   include_spip('base/upgrade');
   maj_plugin($nom_meta_base_version, $version_cible, $maj);