From 9f1f97e0c56771208305b28a740504c220287053 Mon Sep 17 00:00:00 2001
From: N3WT DE COMPET <n3wt.school@gmail.com>
Date: Thu, 24 Apr 2025 18:35:58 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20Utilisation=20des=20bonnes=20colonnes=20?=
 =?UTF-8?q?pour=20les=20fees=20et=20discounts=20selon=20si=20on=20est=20da?=
 =?UTF-8?q?ns=20le=20mode=20subscription=20ou=20non=20(fix=20d'une=20r?=
 =?UTF-8?q?=C3=A9gression)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Structure/Tarification/DiscountsSection.js  | 15 +++++++++++----
 .../Structure/Tarification/FeesSection.js       | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Front-End/src/components/Structure/Tarification/DiscountsSection.js b/Front-End/src/components/Structure/Tarification/DiscountsSection.js
index 233f61b..333caad 100644
--- a/Front-End/src/components/Structure/Tarification/DiscountsSection.js
+++ b/Front-End/src/components/Structure/Tarification/DiscountsSection.js
@@ -8,7 +8,7 @@ import logger from '@/utils/logger';
 import { ESTABLISHMENT_ID } from '@/utils/Url';
 import SectionHeader from '@/components/SectionHeader';
 
-const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, handleDelete, type, selectedDiscounts, handleDiscountSelection }) => {
+const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, handleDelete, type, subscriptionMode = false, selectedDiscounts, handleDiscountSelection }) => {
   const [editingDiscount, setEditingDiscount] = useState(null);
   const [newDiscount, setNewDiscount] = useState(null);
   const [formData, setFormData] = useState({});
@@ -254,7 +254,14 @@ const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, h
     }
   };
 
-  const columns = [
+  const columns = subscriptionMode
+      ? [
+        { name: 'LIBELLE', label: 'Libellé' },
+        { name: 'DESCRIPTION', label: 'Description' },
+        { name: 'REMISE', label: 'Remise' },
+        { name: '', label: 'Sélection' }
+      ]
+      :  [
       { name: 'LIBELLE', label: 'Libellé' },
       { name: 'REMISE', label: 'Remise' },
       { name: 'DESCRIPTION', label: 'Description' },
@@ -268,8 +275,8 @@ const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, h
         icon={Tag}
         discountStyle = {true}
         title={`${type == 0 ? "Liste des réductions sur les frais d'inscription" : "Liste des réductions sur les frais de scolarité"}`}
-        description={`${type == 0 ? "Gérez vos réductions sur les frais d'inscription" : "Gérez vos réductions sur les frais de scolarité"}`}
-        button={true}
+        description={`${subscriptionMode ? "Sélectionnez" : "Gérez"} ${type == 0 ? " vos réductions sur les frais d'inscription" : " vos réductions sur les frais de scolarité"}`}
+        button={!subscriptionMode}
         onClick={handleAddDiscount}
       />
       <Table
diff --git a/Front-End/src/components/Structure/Tarification/FeesSection.js b/Front-End/src/components/Structure/Tarification/FeesSection.js
index 49de027..b01b125 100644
--- a/Front-End/src/components/Structure/Tarification/FeesSection.js
+++ b/Front-End/src/components/Structure/Tarification/FeesSection.js
@@ -9,7 +9,7 @@ import SectionHeader from '@/components/SectionHeader';
 
 import { ESTABLISHMENT_ID } from '@/utils/Url';
 
-const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handleDelete, type, selectedFees, handleFeeSelection }) => {
+const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handleDelete, type, subscriptionMode = false, selectedFees, handleFeeSelection }) => {
   const [editingFee, setEditingFee] = useState(null);
   const [newFee, setNewFee] = useState(null);
   const [formData, setFormData] = useState({});
@@ -244,7 +244,14 @@ const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handl
     }
   };
 
-  const columns = [
+  const columns = subscriptionMode
+      ? [
+        { name: 'NOM', label: 'Nom' },
+        { name: 'DESCRIPTION', label: 'Description' },
+        { name: 'MONTANT', label: 'Montant de base' },
+        { name: '', label: 'Sélection' }
+      ]
+      : [
         { name: 'NOM', label: 'Nom' },
         { name: 'MONTANT', label: 'Montant de base' },
         { name: 'DESCRIPTION', label: 'Description' },
@@ -253,12 +260,12 @@ const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handl
       ];
 
   return (
-    <div className="space-y-4">      
+    <div className="space-y-4">
       <SectionHeader
         icon={CreditCard}
         title={`${type == 0 ? "Liste des frais d'inscription" : "Liste des frais de scolarité"}`}
-        description={`${type == 0 ? "Gérez vos frais d'inscription" : "Gérez vos frais de scolarité"}`}
-        button={true}
+        description={`${subscriptionMode ? "Sélectionnez" : "Gérez"} ${type == 0 ? " vos frais d'inscription" : " vos frais de scolarité"}`}
+        button={!subscriptionMode}
         onClick={handleAddFee}
       />
       <Table