Xor290/projet_gestion_commande
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: build
Frontend Admin - EAS Build / build (push) Canceled after 0s
Details
Frontend Client - EAS Build / build (push) Canceled after 0s
Details
Backend - Build & Lint / build (push) Failing after 25m18s
Details
Frontend Web - Build & Lint / build (push) Failing after 9m58s
Details

Browse Source
This commit is contained in:
Xor290
2026-08-06 12:06:05 +02:00
parent c034088bee
commit 22a8d5026c
174 changed files with 30315 additions and 16120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/screens/client/OrderTrackingScreen.tsx
+61 -22
View File
@@ -101,7 +101,9 @@ export default function OrderTrackingScreen() {
}, []);
useEffect(() => {
getPublicSettings().then((s) => setPenaltiesEnabled(s.penalties_enabled)).catch(() => {});
getPublicSettings()
.then((s) => setPenaltiesEnabled(s.penalties_enabled))
.catch(() => {});
}, []);
useFocusEffect(
@@ -392,7 +394,10 @@ export default function OrderTrackingScreen() {
renderItem={({ item: order }) => {
const expanded = expandedId === order.id;
const gross = calculateOrderTotal(order);
const total = Math.max(0, gross - (order.referral_used ?? 0));
const total = Math.max(
0,
gross - (order.referral_used ?? 0),
);
const progress = STATUS_PROGRESS[order.status] || 0;
const track = tracking[order.id];
const eta = etas[order.id];
@@ -456,8 +461,18 @@ export default function OrderTrackingScreen() {
{formatPrice(total)}
</Text>
{(order.referral_used ?? 0) > 0 && (
<Text style={{ fontSize: 11, color: colors.success, marginTop: 2 }}>
dont -{(order.referral_used as number).toFixed(2)} € parrainage
<Text
style={{
fontSize: 11,
color: colors.success,
marginTop: 2,
}}
>
dont -
{(
order.referral_used as number
).toFixed(2)}{" "}
€ parrainage
</Text>
)}
</View>
@@ -559,7 +574,8 @@ export default function OrderTrackingScreen() {
color={colors.warning}
/>
<Text style={styles.trackText}>
{eta?.eta_minutes != null && eta.eta_minutes > 0
{eta?.eta_minutes != null &&
eta.eta_minutes > 0
? `Temps de livraison estimé : ~${eta.eta_minutes} min`
: "Aucune heure disponible"}
</Text>
@@ -573,7 +589,8 @@ export default function OrderTrackingScreen() {
color={colors.warning}
/>
<Text style={styles.trackText}>
Temps de livraison estimé : ~
Temps de livraison estimé :
~
{eta?.eta_minutes != null &&
eta.eta_minutes > 0 &&
eta.eta_minutes < 5
@@ -684,20 +701,35 @@ export default function OrderTrackingScreen() {
>
<View style={styles.modalBody}>
{penaltiesEnabled && (
<View style={{
flexDirection: "row",
alignItems: "flex-start",
gap: 8,
backgroundColor: colors.danger + "18",
borderWidth: 1,
borderColor: colors.danger + "55",
borderRadius: 8,
padding: 12,
marginBottom: 12,
}}>
<Ionicons name="warning-outline" size={18} color={colors.danger} style={{ marginTop: 1 }} />
<Text style={{ flex: 1, color: colors.danger, fontSize: 13, lineHeight: 18 }}>
Attention : en cas d'annulations répétées, une amende sera appliquée à votre compte.
<View
style={{
flexDirection: "row",
alignItems: "flex-start",
gap: 8,
backgroundColor: colors.danger + "18",
borderWidth: 1,
borderColor: colors.danger + "55",
borderRadius: 8,
padding: 12,
marginBottom: 12,
}}
>
<Ionicons
name="warning-outline"
size={18}
color={colors.danger}
style={{ marginTop: 1 }}
/>
<Text
style={{
flex: 1,
color: colors.danger,
fontSize: 13,
lineHeight: 18,
}}
>
Attention : en cas d'annulations répétées, une
amende sera appliquée à votre compte.
</Text>
</View>
)}
@@ -765,8 +797,15 @@ export default function OrderTrackingScreen() {
size={16}
color={colors.danger}
/>
<Text style={[styles.penaltyDetail, { color: colors.danger, fontWeight: "700" }]}>
Amende : {penaltyWarning.penalty_warning.penalty_amount} €
<Text
style={[
styles.penaltyDetail,
{ color: colors.danger, fontWeight: "700" },
]}
>
Amende :{" "}
{penaltyWarning.penalty_warning.penalty_amount}{" "}
€
</Text>
</View>
)}