diff --git a/frontend-prep/src/pages/User/SuiviLivraison.tsx b/frontend-prep/src/pages/User/SuiviLivraison.tsx index 300f3326..14d5f192 100644 --- a/frontend-prep/src/pages/User/SuiviLivraison.tsx +++ b/frontend-prep/src/pages/User/SuiviLivraison.tsx @@ -73,21 +73,19 @@ interface ToastMessage { * Somme des prix individuels (pas de multiplication) */ const getTotalAmount = (order: OrderWithTracking): number => { - let gross = 0; - + if (typeof order.total_prix === "number" && order.total_prix > 0) { + return order.total_prix; + } if (typeof order.total === "number" && order.total > 0) { - gross = order.total; - } else if (typeof order.total_prix === "number" && order.total_prix > 0) { - gross = order.total_prix; - } else if (order.items && order.items.length > 0) { - gross = order.items.reduce((sum, item) => { + return order.total; + } + if (order.items && order.items.length > 0) { + return order.items.reduce((sum, item) => { const itemPrice = item.prix || item.price || 0; return sum + itemPrice; }, 0); } - - const referralUsed = typeof order.referral_used === "number" ? order.referral_used : 0; - return Math.max(0, gross - referralUsed); + return 0; }; const getClientInfo = (order: OrderWithTracking) => { @@ -931,7 +929,7 @@ function SuiviLivraison() { )}
- {getTotalAmount(order).toFixed(2)} € + {Math.max(0, getTotalAmount(order) - (order.referral_used ?? 0)).toFixed(2)} €
{(order.referral_used ?? 0) > 0 && (