From a3e855870c567f38b598132ae7d22af22e3690db Mon Sep 17 00:00:00 2001
From: engel <>
Date: Thu, 17 Feb 2022 14:14:12 +0000
Subject: [PATCH] =?UTF-8?q?int=C3=A9gration=20taux=20r=C3=A9duction=20dans?=
 =?UTF-8?q?=20index.tpl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FossilOrigin-Name: 8c48a54785b11f3109f0ca66e5a8fe5220a632352333399477522fba9ed78662
---
 templates/index.tpl                | 33 +++++++++++++++++++++---------
 www/admin/versements_activites.php |  2 +-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/templates/index.tpl b/templates/index.tpl
index 77c1c06..c7df99a 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -47,6 +47,20 @@
             </dl>
         </fieldset>
     </div>
+
+    <div id="taux_reduc" class="tous hidden">
+        <h2>Choisir le taux de réduction</h2>
+        <fieldset>
+            {foreach from=$plugin_config->reduction item="reduc"}
+            <span class="radio-btn">
+                <input type="radio" id="{$reduc->taux}"
+                       name="taux_reduction" value="{$reduc->taux}" />
+                 <label for="{$reduc->taux}">{$reduc->taux}{if $reduc->remarque != ""} - {$reduc->remarque}{/if}</label>
+            </span>
+            {/foreach}
+        </fieldset>
+    </div>
+
     <div id="generer_tous" class="tous hidden">
         <p class=" submit">
             {csrf_field key="generer_tous_recus"}
@@ -56,6 +70,7 @@
 
     <div id="liste_activites_tarifs" class="activites hidden">
         <h2>Choisir les activités et tarifs concernés par les reçus ainsi que le taux de réduction</h2>
+        <fieldset>
         <table class="list">
             <thead>
                 <tr>
@@ -76,16 +91,13 @@
                             <span>{$activite.titreActivite} - {$activite.titreTarif}</span>
                         </td>
                         <td>
-                            <span class="radio-btn">
-                                <input type="radio" id="taux_normal_{$activite.idTarif}"
-                                    name="taux_reduction_{$activite.idTarif}" value="{$plugin_config->reduction[0]->taux}" disabled />
-                                <label for="taux_normal_{$activite.idTarif}">normal</label>
-                            </span>
-                            <span class=" radio-btn">
-                                <input type="radio" id="taux_majore_{$activite.idTarif}"
-                                    name="taux_reduction_{$activite.idTarif}" value="{$plugin_config->reduction[1]->taux}" disabled />
-                                <label for="taux_majore_{$activite.idTarif}">majoré</label>
-                            </span>
+                        {foreach from=$plugin_config->reduction item="reduc"}
+                        <span class="radio-btn">
+                            <input type="radio" id="taux_{$reduc->taux}_{$activite.idTarif}"
+                                   name="taux_reduction_{$activite.idTarif}" value="{$reduc->taux}" disabled />
+                            <label for="taux_{$reduc->taux}_{$activite.idTarif}">{$reduc->taux}{if $reduc->remarque != ""} - {$reduc->remarque}{/if}</label>
+                        </span>
+                        {/foreach}
                         </td>
                         <td>{if $activite.descActivite != ""}{$activite.descActivite} ; {/if}{$activite.descTarif}</td>
                         <td>{$activite.numeroCpt} : {$activite.nomCpt}</td>
@@ -94,6 +106,7 @@
             </tbody>
         </table>
         <p class="help">Si vous ne savez pas quel taux de réduction utiliser, n'en choisissez aucun</p>
+        </fieldset>
     </div>
 
     <div id="generer_activites" class="activites hidden">
diff --git a/www/admin/versements_activites.php b/www/admin/versements_activites.php
index aa24707..92643dd 100644
--- a/www/admin/versements_activites.php
+++ b/www/admin/versements_activites.php
@@ -20,7 +20,7 @@ $tauxSelectionnes = array();
 foreach ($tarifsSelectionnes as $idTarif) {
     $nomRadio = "taux_reduction_" . $idTarif;
     $valRadio = f("$nomRadio");
-    $tauxSelectionnes[] = $valRadio ? $valRadio: $plugin->getConfig()->reduction[0]->taux;
+    $tauxSelectionnes[] = $valRadio ? $valRadio: $plugin->getConfig('reduction')[0]->taux;
 }
 // obtenir les instances de tarifs correspondant à la sélection
 $lesTarifs = array();