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

chore: add point pool

Browse Source
This commit is contained in:
Xor290
2026-03-14 00:23:02 +01:00
parent f7be7ea5aa
commit 0523ed6356
10 changed files with 441 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend-admin/src/api/api_admin.ts
+8 -7
View File
@@ -704,6 +704,13 @@ export interface PointsTier {
points: number;
}
export interface PointsPool {
key: string;
name: string;
categories: string[];
tiers: PointsTier[];
}
export interface PostalZone {
name: string;
min_amount: number;
@@ -744,13 +751,7 @@ export interface AppSettings {
penalties_enabled: boolean;
show_amende_score: boolean;
points_enabled: boolean;
points_categories_weed: string[];
points_categories_zipette: string[];
points_categories_total: string[];
points_separated: boolean;
points_weed_tiers: PointsTier[];
points_zipette_tiers: PointsTier[];
points_total_tiers: PointsTier[];
points_pools: PointsPool[];
referral_enabled: boolean;
delivery_schedule: DeliverySchedule;
postal_zones: PostalZone[];
frontend-admin/src/screens/admin/OrdersScreen.tsx
+35
View File
@@ -255,6 +255,26 @@ export default function OrdersScreen() {
paddingHorizontal: spacing.l,
paddingVertical: spacing.s,
},
refreshRow: {
paddingHorizontal: spacing.l,
paddingBottom: spacing.s,
alignItems: "flex-start",
},
refreshBtn: {
flexDirection: "row",
alignItems: "center",
gap: spacing.xs,
paddingHorizontal: spacing.m,
paddingVertical: spacing.s,
backgroundColor: colors.bgCard,
borderRadius: borderRadius.sm,
borderWidth: 1,
borderColor: colors.border,
},
refreshBtnText: {
color: colors.textSecondary,
fontSize: fontSize.sm,
},
filterBtn: {
paddingHorizontal: spacing.l,
paddingVertical: spacing.s,
@@ -620,6 +640,20 @@ export default function OrdersScreen() {
style={styles.filterList}
showsHorizontalScrollIndicator={false}
/>
<View style={styles.refreshRow}>
<TouchableOpacity
style={styles.refreshBtn}
onPress={onRefresh}
disabled={refreshing}
>
<Ionicons
name="refresh-outline"
size={16}
color={refreshing ? colors.textMuted : colors.accent}
/>
<Text style={styles.refreshBtnText}>Actualiser</Text>
</TouchableOpacity>
</View>
<FlatList
data={commands}
keyExtractor={(item) => item.id.toString()}
@@ -637,6 +671,7 @@ export default function OrdersScreen() {
}
/>
{/* Modal items */}
<Modal
visible={itemsModal.visible}
frontend-admin/src/screens/admin/SettingsScreen.tsx
+165 -141
View File
@@ -15,11 +15,11 @@ import { Ionicons } from "@expo/vector-icons";
import { spacing, fontSize, borderRadius } from "../../theme";
import { useTheme } from "../../context/ThemeContext";
import { getSettings, updateSettings, getCategories, DEFAULT_DELIVERY_SCHEDULE, DEFAULT_POSTAL_ZONES } from "../../api/api_admin";
import type { AppSettings, Category, PointsTier, DaySchedule, DeliverySchedule, PostalZone } from "../../api/api_admin";
import type { AppSettings, Category, PointsTier, PointsPool, DaySchedule, DeliverySchedule, PostalZone } from "../../api/api_admin";
import AlertModal from "../../components/ui/AlertModal";
import { useAlert } from "../../hooks/useAlert";
type PoolAssignment = "weed" | "zipette" | "total" | "none";
const POOL_COLORS = ["#10b981", "#9333ea", "#f97316", "#3b82f6", "#ef4444"];
const DAYS: { key: keyof DeliverySchedule; label: string }[] = [
{ key: "monday", label: "Lundi" },
@@ -634,13 +634,10 @@ export default function SettingsScreen() {
penalties_enabled: true,
show_amende_score: true,
points_enabled: true,
points_categories_weed: [],
points_categories_zipette: [],
points_categories_total: [],
points_separated: true,
points_weed_tiers: [],
points_zipette_tiers: [],
points_total_tiers: [],
points_pools: [
{ key: "pool_0", name: "Pool 1", categories: [], tiers: [] },
{ key: "pool_1", name: "Pool 2", categories: [], tiers: [] },
],
referral_enabled: true,
delivery_schedule: DEFAULT_DELIVERY_SCHEDULE,
postal_zones: DEFAULT_POSTAL_ZONES,
@@ -681,10 +678,7 @@ export default function SettingsScreen() {
if (settingsRes.success && settingsRes.settings) {
setSettings({
...settingsRes.settings,
points_categories_weed: settingsRes.settings.points_categories_weed ?? [],
points_categories_zipette: settingsRes.settings.points_categories_zipette ?? [],
points_categories_total: settingsRes.settings.points_categories_total ?? [],
points_total_tiers: settingsRes.settings.points_total_tiers ?? [],
points_pools: settingsRes.settings.points_pools ?? [],
delivery_schedule: settingsRes.settings.delivery_schedule ?? DEFAULT_DELIVERY_SCHEDULE,
postal_zones: settingsRes.settings.postal_zones ?? DEFAULT_POSTAL_ZONES,
});
@@ -702,22 +696,65 @@ export default function SettingsScreen() {
loadData();
}, [loadData]);
const getPoolFor = (name: string): PoolAssignment => {
if ((settings.points_categories_weed ?? []).includes(name)) return "weed";
if ((settings.points_categories_zipette ?? []).includes(name)) return "zipette";
if ((settings.points_categories_total ?? []).includes(name)) return "total";
return "none";
// Retourne l'index du pool auquel la catégorie est assignée, ou -1 si aucun
const getPoolIndexFor = (catName: string): number => {
const pools = settings.points_pools ?? [];
for (let i = 0; i < pools.length; i++) {
if ((pools[i].categories ?? []).includes(catName)) return i;
}
return -1;
};
const setPool = (name: string, pool: PoolAssignment) => {
// Assigne une catégorie à un pool (ou la retire si poolIdx === -1)
const setCategoryPool = (catName: string, poolIdx: number) => {
setSettings((prev) => {
const weed = (prev.points_categories_weed ?? []).filter((c) => c !== name);
const zipette = (prev.points_categories_zipette ?? []).filter((c) => c !== name);
const total = (prev.points_categories_total ?? []).filter((c) => c !== name);
if (pool === "weed") weed.push(name);
else if (pool === "zipette") zipette.push(name);
else if (pool === "total") total.push(name);
return { ...prev, points_categories_weed: weed, points_categories_zipette: zipette, points_categories_total: total };
const pools = (prev.points_pools ?? []).map((pool, i) => ({
...pool,
categories: (pool.categories ?? []).filter((c) => c !== catName),
}));
if (poolIdx >= 0 && poolIdx < pools.length) {
pools[poolIdx] = {
...pools[poolIdx],
categories: [...(pools[poolIdx].categories ?? []), catName],
};
}
return { ...prev, points_pools: pools };
});
};
const addPool = () => {
setSettings((prev) => {
const pools = prev.points_pools ?? [];
const newKey = `pool_${Date.now()}`;
return {
...prev,
points_pools: [...pools, { key: newKey, name: `Type ${pools.length + 1}`, categories: [], tiers: [] }],
};
});
};
const removePool = (poolIdx: number) => {
setSettings((prev) => {
const pools = (prev.points_pools ?? []).filter((_, i) => i !== poolIdx);
return { ...prev, points_pools: pools };
});
};
const renamePool = (poolIdx: number, name: string) => {
setSettings((prev) => {
const pools = (prev.points_pools ?? []).map((p, i) =>
i === poolIdx ? { ...p, name } : p
);
return { ...prev, points_pools: pools };
});
};
const updatePoolTiers = (poolIdx: number, tiers: PointsTier[]) => {
setSettings((prev) => {
const pools = (prev.points_pools ?? []).map((p, i) =>
i === poolIdx ? { ...p, tiers } : p
);
return { ...prev, points_pools: pools };
});
};
@@ -842,12 +879,7 @@ export default function SettingsScreen() {
);
}
const WEED_COLOR = "#10b981";
const ZIP_COLOR = "#9333ea";
const TOTAL_COLOR = "#f97316";
// Tous les chips toujours disponibles — la config reste modifiable à tout moment
const allChips: PoolAssignment[] = ["weed", "zipette", "total", "none"];
const pools = settings.points_pools ?? [];
return (
<View style={s.container}>
@@ -918,7 +950,7 @@ export default function SettingsScreen() {
<View style={s.rowLeft}>
<Text style={s.rowLabel}>Points activés</Text>
<Text style={s.rowDesc}>
Les clients voient leurs scores de points et point_zipette.{"\n"}
Les clients voient leurs scores de points.{"\n"}
La cabine peut réinitialiser les points.
</Text>
</View>
@@ -931,22 +963,42 @@ export default function SettingsScreen() {
thumbColor="#fff"
/>
</View>
<View style={s.row}>
<View style={s.rowLeft}>
<Text style={s.rowLabel}>Points séparés par pool</Text>
<Text style={s.rowDesc}>
Activé : barèmes Weed + Zipette utilisés séparément{"\n"}
Désactivé : barème Total utilisé (catégorie T)
</Text>
</View>
<Switch
value={settings.points_separated}
onValueChange={(v) =>
setSettings((prev) => ({ ...prev, points_separated: v }))
}
trackColor={{ false: colors.border, true: colors.accent }}
thumbColor="#fff"
/>
{/* Gestion des types de points */}
<View style={{ paddingHorizontal: spacing.l, paddingBottom: spacing.m, borderTopWidth: 1, borderTopColor: colors.border, paddingTop: spacing.m }}>
<Text style={[s.rowLabel, { marginBottom: spacing.s }]}>Types de points</Text>
<Text style={[s.rowDesc, { marginBottom: spacing.m }]}>
Créez vos propres types de points. Le 1er type → colonne principale, le 2e → colonne secondaire.
</Text>
{pools.map((pool, i) => {
const color = POOL_COLORS[i % POOL_COLORS.length];
return (
<View key={pool.key} style={{ flexDirection: "row", alignItems: "center", gap: spacing.s, marginBottom: spacing.s }}>
<View style={[s.colorDot, { backgroundColor: color, width: 12, height: 12, borderRadius: 6 }]} />
<TextInput
style={[s.thresholdInput, { flex: 1 }]}
value={pool.name}
onChangeText={(v) => renamePool(i, v)}
placeholder={`Type ${i + 1}`}
placeholderTextColor={colors.textMuted}
/>
<TouchableOpacity onPress={() => removePool(i)}>
<Ionicons name="trash-outline" size={18} color={colors.danger} />
</TouchableOpacity>
</View>
);
})}
{pools.length < 2 && (
<TouchableOpacity
onPress={addPool}
style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs, marginTop: spacing.xs }}
>
<Ionicons name="add-circle-outline" size={18} color={colors.accent} />
<Text style={{ fontSize: fontSize.sm, color: colors.accent, fontWeight: "600" }}>
Ajouter un type
</Text>
</TouchableOpacity>
)}
</View>
</View>
@@ -954,26 +1006,18 @@ export default function SettingsScreen() {
<View style={s.section}>
<Text style={s.sectionTitle}>Attribution des catégories aux points</Text>
<Text style={s.hint}>
{settings.points_separated
? "Mode séparé actif : W et Z utilisés pour le calcul. T ignoré."
: "Mode non-séparé actif : T utilisé pour le calcul. W et Z ignorés."}
{"\n"}Vous pouvez modifier les attributions à tout moment.
Choisissez quel type de point est attribué pour chaque catégorie de produit.{"\n"}
Vous pouvez modifier les attributions à tout moment.
</Text>
{/* Légende */}
<View style={{ flexDirection: "row", gap: spacing.m, paddingHorizontal: spacing.l, paddingBottom: spacing.m, flexWrap: "wrap" }}>
<View style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs }}>
<View style={[s.colorDot, { backgroundColor: WEED_COLOR }]} />
<Text style={{ fontSize: fontSize.sm, color: colors.textMuted }}>Weed</Text>
</View>
<View style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs }}>
<View style={[s.colorDot, { backgroundColor: ZIP_COLOR }]} />
<Text style={{ fontSize: fontSize.sm, color: colors.textMuted }}>Zipette</Text>
</View>
<View style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs }}>
<View style={[s.colorDot, { backgroundColor: TOTAL_COLOR }]} />
<Text style={{ fontSize: fontSize.sm, color: colors.textMuted }}>Total</Text>
</View>
{pools.map((pool, i) => (
<View key={pool.key} style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs }}>
<View style={[s.colorDot, { backgroundColor: POOL_COLORS[i % POOL_COLORS.length] }]} />
<Text style={{ fontSize: fontSize.sm, color: colors.textMuted }}>{pool.name}</Text>
</View>
))}
<View style={{ flexDirection: "row", alignItems: "center", gap: spacing.xs }}>
<View style={[s.colorDot, { backgroundColor: colors.border }]} />
<Text style={{ fontSize: fontSize.sm, color: colors.textMuted }}>Aucun</Text>
@@ -981,7 +1025,7 @@ export default function SettingsScreen() {
</View>
{categories.map((cat, index) => {
const pool = getPoolFor(cat.name);
const assignedPoolIdx = getPoolIndexFor(cat.name);
return (
<View
key={cat.id}
@@ -995,53 +1039,43 @@ export default function SettingsScreen() {
/>
<Text style={s.catName}>{cat.name}</Text>
<View style={s.chips}>
{allChips.map((p) => {
const active = pool === p;
const chipColor =
p === "weed"
? WEED_COLOR
: p === "zipette"
? ZIP_COLOR
: p === "total"
? TOTAL_COLOR
: colors.textMuted;
const label =
p === "weed"
? "W"
: p === "zipette"
? "Z"
: p === "total"
? "T"
: "—";
return (
<TouchableOpacity
key={p}
style={[
s.chip,
{
borderColor: chipColor,
backgroundColor: active
? chipColor
: "transparent",
},
]}
onPress={() => setPool(cat.name, p)}
>
<Text
style={[
s.chipText,
{
color: active
? "#fff"
: chipColor,
},
]}
>
{label}
</Text>
</TouchableOpacity>
);
})}
{pools.map((pool, pi) => {
const active = assignedPoolIdx === pi;
const chipColor = POOL_COLORS[pi % POOL_COLORS.length];
const label = pool.name.slice(0, 2).toUpperCase();
return (
<TouchableOpacity
key={pool.key}
style={[
s.chip,
{
borderColor: chipColor,
backgroundColor: active ? chipColor : "transparent",
},
]}
onPress={() => setCategoryPool(cat.name, active ? -1 : pi)}
>
<Text style={[s.chipText, { color: active ? "#fff" : chipColor }]}>
{label}
</Text>
</TouchableOpacity>
);
})}
{/* Chip "Aucun" */}
<TouchableOpacity
style={[
s.chip,
{
borderColor: colors.textMuted,
backgroundColor: assignedPoolIdx === -1 ? colors.textMuted : "transparent",
},
]}
onPress={() => setCategoryPool(cat.name, -1)}
>
<Text style={[s.chipText, { color: assignedPoolIdx === -1 ? "#fff" : colors.textMuted }]}>
—
</Text>
</TouchableOpacity>
</View>
</View>
);
@@ -1052,36 +1086,26 @@ export default function SettingsScreen() {
Aucune catégorie disponible
</Text>
)}
{pools.length === 0 && categories.length > 0 && (
<Text style={[s.hint, { paddingTop: 0 }]}>
Ajoutez au moins un type de point pour assigner des catégories.
</Text>
)}
</View>
{/* Barèmes de points — toujours présents */}
<TiersSection
title="Barème Weed / Hash"
tiers={settings.points_weed_tiers ?? []}
onChange={(tiers) => setSettings((p) => ({ ...p, points_weed_tiers: tiers }))}
colors={colors}
s={s}
accentColor={WEED_COLOR}
active={settings.points_separated}
/>
<TiersSection
title="Barème Zipette"
tiers={settings.points_zipette_tiers ?? []}
onChange={(tiers) => setSettings((p) => ({ ...p, points_zipette_tiers: tiers }))}
colors={colors}
s={s}
accentColor={ZIP_COLOR}
active={settings.points_separated}
/>
<TiersSection
title="Barème Total"
tiers={settings.points_total_tiers ?? []}
onChange={(tiers) => setSettings((p) => ({ ...p, points_total_tiers: tiers }))}
colors={colors}
s={s}
accentColor={TOTAL_COLOR}
active={!settings.points_separated}
/>
{/* Barèmes de points — un par pool */}
{pools.map((pool, i) => (
<TiersSection
key={pool.key}
title={`Barème — ${pool.name}`}
tiers={pool.tiers ?? []}
onChange={(tiers) => updatePoolTiers(i, tiers)}
colors={colors}
s={s}
accentColor={POOL_COLORS[i % POOL_COLORS.length]}
active={true}
/>
))}
{/* Horaires de livraison */}
<DeliveryScheduleSection
frontend-admin/src/screens/cabine/OrdersScreen.tsx
+35
View File
@@ -226,6 +226,27 @@ export default function OrdersScreen() {
() =>
StyleSheet.create({
container: { flex: 1, backgroundColor: colors.bgPrimary },
refreshRow: {
paddingHorizontal: spacing.l,
paddingTop: spacing.m,
paddingBottom: spacing.s,
alignItems: "flex-start",
},
refreshBtn: {
flexDirection: "row",
alignItems: "center",
gap: spacing.xs,
paddingHorizontal: spacing.m,
paddingVertical: spacing.s,
backgroundColor: colors.bgCard,
borderRadius: borderRadius.sm,
borderWidth: 1,
borderColor: colors.border,
},
refreshBtnText: {
color: colors.textSecondary,
fontSize: fontSize.sm,
},
row: {
flexDirection: "row",
justifyContent: "space-between",
@@ -525,6 +546,20 @@ export default function OrdersScreen() {
return (
<View style={styles.container}>
<View style={styles.refreshRow}>
<TouchableOpacity
style={styles.refreshBtn}
onPress={onRefresh}
disabled={refreshing}
>
<Ionicons
name="refresh-outline"
size={16}
color={refreshing ? colors.textMuted : colors.accent}
/>
<Text style={styles.refreshBtnText}>Actualiser</Text>
</TouchableOpacity>
</View>
<FlatList
data={commands}
keyExtractor={(item) => item.id.toString()}
frontend-admin/src/screens/delivery/DashboardScreen.tsx
-6
View File
@@ -1671,12 +1671,6 @@ export default function DashboardScreen() {
/>
{" "}Client
</Text>
<View style={styles.detailRow}>
<Text style={styles.detailLabel}>Pseudo</Text>
<Text style={styles.detailValue}>
{detailsDelivery?.clientUsername || "—"}
</Text>
</View>
<View style={styles.detailRow}>
<Text style={styles.detailLabel}>Prénom</Text>
<Text style={styles.detailValue}>