From ca09c2cf9dbc7a7e7e1e6ef9bdf8f05bf748d7b2 Mon Sep 17 00:00:00 2001
From: engel <>
Date: Thu, 17 Mar 2022 14:55:54 +0000
Subject: [PATCH] correction faute de frappe dans config.json

FossilOrigin-Name: 5595d6a14b941ccaecc9c4a8d0da6ec0b3a78e91f9d7f0ef47a98bcdb34b1c3f
---
 config.json                     |  2 +-
 lib/RecusHTML.php               |  3 ++-
 templates/config.tpl            | 10 ++++++++++
 www/admin/config.php            |  4 ++++
 www/admin/generer_personnes.php |  1 +
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index 27ff89b..6c0b346 100644
--- a/config.json
+++ b/config.json
@@ -5,7 +5,7 @@
             "valeur" : 0
         },
         {
-            "titre" : "228 bis",
+            "titre" : "238 bis",
             "valeur" : 0
         },
         {
diff --git a/lib/RecusHTML.php b/lib/RecusHTML.php
index 13e0ba9..c2c722f 100644
--- a/lib/RecusHTML.php
+++ b/lib/RecusHTML.php
@@ -11,6 +11,7 @@ class RecusHTML
     private $objetAsso;
     private $nomResponsable;
     private $fonctionResponsable;
+    private $villeAsso;
     private $articlesCGI;
     private $signature;
 
@@ -115,7 +116,7 @@ FDD;
         $date = date("j/m/Y");
 echo <<<FDD
         <div class="cartouche" id="final">
-        <p>Rennes le {$date}</p>
+        <p>{this->villeAsso} le {$date}</p>
         <img id="signature" src="$this->signature" />
         <p id="nom">$this->nomResponsable</p>
         <p id="fonction">$this->fonctionResponsable</p>
diff --git a/templates/config.tpl b/templates/config.tpl
index 04e36a9..df61059 100644
--- a/templates/config.tpl
+++ b/templates/config.tpl
@@ -82,6 +82,16 @@
         </dl>
     </fieldset>
 
+    <fieldset>
+        <legend>Autres informations</legend>
+         <dl class="config">
+            <dt><label>Ville</label></dt>
+            <p>Précède la date sur le formulaire</p>
+            {input type="text" name="ville_asso" source=$plugin.config label="" maxlength=50}
+        </dl>
+    </fieldset>
+
+
     <h3 class="warning">N'oubliez pas d'enregistrer, sinon les modifications ne seront pas prises en compte !</h3>
 
     <p class="submit">
diff --git a/www/admin/config.php b/www/admin/config.php
index ebd1137..58c8b0b 100644
--- a/www/admin/config.php
+++ b/www/admin/config.php
@@ -59,6 +59,10 @@ if (f('save') && $form->check('recusfiscaux_config'))
             $plugin->setConfig('signature', $_SESSION['sig_file'][0]->path);
         }
 
+        // autres informations
+        // ville
+        $plugin->setConfig('ville_asso', trim(f('ville_asso'));
+
         \Garradin\Utils::redirect(PLUGIN_URL . 'config.php?ok');
     }
     catch (UserException $e)
diff --git a/www/admin/generer_personnes.php b/www/admin/generer_personnes.php
index 524d3d1..1b57127 100644
--- a/www/admin/generer_personnes.php
+++ b/www/admin/generer_personnes.php
@@ -41,6 +41,7 @@ foreach ($versementsSelectionnes as $ligne)
         $plugin->getConfig('objet_asso'),
         $plugin->getConfig('nom_responsable'),
         $plugin->getConfig('fonction_responsable'),
+        $plugin->getConfig('ville_asso');
         $articlesCGI,
         $signature
     );