acasini/n3wt-school
1
0
Fork 0
mirror of https://git.v0id.ovh/n3wt-innov/n3wt-school.git synced 2026-01-29 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Utilisation des bonnes colonnes pour les fees et discounts selon si

Browse Source 
on est dans le mode subscription ou non (fix d'une régression)
This commit is contained in:
N3WT DE COMPET
2025-04-24 18:35:58 +02:00
parent 8417d3eb14
commit 9f1f97e0c5
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Front-End/src/components/Structure/Tarification/DiscountsSection.js
View File

@ -8,7 +8,7 @@ import logger from '@/utils/logger';
import { ESTABLISHMENT_ID } from '@/utils/Url'; import { ESTABLISHMENT_ID } from '@/utils/Url';
import SectionHeader from '@/components/SectionHeader'; 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 [editingDiscount, setEditingDiscount] = useState(null);
const [newDiscount, setNewDiscount] = useState(null); const [newDiscount, setNewDiscount] = useState(null);
const [formData, setFormData] = useState({}); 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: 'LIBELLE', label: 'Libellé' },
{ name: 'REMISE', label: 'Remise' }, { name: 'REMISE', label: 'Remise' },
{ name: 'DESCRIPTION', label: 'Description' }, { name: 'DESCRIPTION', label: 'Description' },
@ -268,8 +275,8 @@ const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, h
icon={Tag} icon={Tag}
discountStyle = {true} discountStyle = {true}
title={`${type == 0 ? "Liste des réductions sur les frais d'inscription" : "Liste des réductions sur les frais de scolarité"}`} 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é"}`} 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={true} button={!subscriptionMode}
onClick={handleAddDiscount} onClick={handleAddDiscount}
/> />
<Table <Table

15
Front-End/src/components/Structure/Tarification/FeesSection.js
View File

@ -9,7 +9,7 @@ import SectionHeader from '@/components/SectionHeader';
import { ESTABLISHMENT_ID } from '@/utils/Url'; 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 [editingFee, setEditingFee] = useState(null);
const [newFee, setNewFee] = useState(null); const [newFee, setNewFee] = useState(null);
const [formData, setFormData] = useState({}); 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: 'NOM', label: 'Nom' },
{ name: 'MONTANT', label: 'Montant de base' }, { name: 'MONTANT', label: 'Montant de base' },
{ name: 'DESCRIPTION', label: 'Description' }, { name: 'DESCRIPTION', label: 'Description' },
@ -257,8 +264,8 @@ const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handl
<SectionHeader <SectionHeader
icon={CreditCard} icon={CreditCard}
title={`${type == 0 ? "Liste des frais d'inscription" : "Liste des frais de scolarité"}`} 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é"}`} description={`${subscriptionMode ? "Sélectionnez" : "Gérez"} ${type == 0 ? " vos frais d'inscription" : " vos frais de scolarité"}`}
button={true} button={!subscriptionMode}
onClick={handleAddFee} onClick={handleAddFee}
/> />
<Table <Table