diff --git a/backend/src/routes/remboursements.js b/backend/src/routes/remboursements.js index 66ab6ea..6e61bd8 100644 --- a/backend/src/routes/remboursements.js +++ b/backend/src/routes/remboursements.js @@ -165,8 +165,8 @@ router.get('/', (req, res) => { b.*, CASE b.type WHEN 'normal' THEN b.inv_nom_projet - WHEN 'bonus_parrainage' THEN '— Bonus Parrainage' - WHEN 'bonus_plateforme' THEN '— Bonus Plateforme' + WHEN 'bonus_parrainage' THEN '— Bonus Parrainage' || CASE WHEN NULLIF(b.notes, '') IS NOT NULL THEN ' — ' || b.notes ELSE '' END + WHEN 'bonus_plateforme' THEN '— Bonus Plateforme' || CASE WHEN NULLIF(b.notes, '') IS NOT NULL THEN ' — ' || b.notes ELSE '' END ELSE b.inv_nom_projet END AS nom_projet, p.nom AS plateforme_nom, diff --git a/frontend/src/components/RembFormModal.jsx b/frontend/src/components/RembFormModal.jsx index 02fb003..b8d8fb2 100644 --- a/frontend/src/components/RembFormModal.jsx +++ b/frontend/src/components/RembFormModal.jsx @@ -137,8 +137,8 @@ export default function RembFormModal({ )} {!locked && isBonus && ( -
- +
+
)} + {!locked && isBonus && ( +
+ + onFieldChange('date_remb', e.target.value)} /> +
+ )} {/* ── Champs remboursement normal ── */} {!isBonus && (<> @@ -264,16 +271,16 @@ export default function RembFormModal({ {/* ── Bonus (mode non verrouillé uniquement) ── */} {!locked && isBonus && (
- - onFieldChange('date_remb', e.target.value)} /> + + onFieldChange('cashback', e.target.value)} />
)} {!locked && isBonus && (
- - onFieldChange('cashback', e.target.value)} /> + + onFieldChange('notes', e.target.value)} />
)}