From c0ff6dcd1d5b27be1005da2c6cc8e4747e5d3c96 Mon Sep 17 00:00:00 2001
From: Xor290 <free6nk33@gmail.com>
Date: Sat, 13 Jun 2026 19:45:19 +0200
Subject: [PATCH] chore: build

---
 backend/gestion/db/db_command_items.go        |  6 ++
 backend/gestion/handlers/deleviry.go          |  7 +-
 .../src/screens/delivery/DashboardScreen.tsx  | 68 +++++++++++++------
 3 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/backend/gestion/db/db_command_items.go b/backend/gestion/db/db_command_items.go
index 6c5e6a28..ed5e9865 100644
--- a/backend/gestion/db/db_command_items.go
+++ b/backend/gestion/db/db_command_items.go
@@ -203,6 +203,8 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]any, error) {
 		ProductID         *int64     `gorm:"column:product_id"`
 		Quantite          float64    `gorm:"column:quantite"`
 		Prix              float64    `gorm:"column:prix"`
+		IsReward          bool       `gorm:"column:is_reward"`
+		RewardPoolKey     string     `gorm:"column:reward_pool_key"`
 		ClientUsername    string     `gorm:"column:client_username"`
 		ClientNom         string     `gorm:"column:client_nom"`
 		ClientPrenom      string     `gorm:"column:client_prenom"`
@@ -230,6 +232,8 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]any, error) {
 		ci.product_id,
 		ci.quantite,
 		ci.prix,
+		ci.is_reward,
+		ci.reward_pool_key,
 		ci.client_username,
 		ci.client_nom,
 		ci.client_prenom,
@@ -276,6 +280,8 @@ func (d *Database) GetCommandItems(commandID int) ([]map[string]any, error) {
 			"product_id":       productIDValue,
 			"quantite":         row.Quantite,
 			"prix":             row.Prix,
+			"is_reward":        row.IsReward,
+			"reward_pool_key":  row.RewardPoolKey,
 			"client_username":  row.ClientUsername,
 			"client_nom":       row.ClientNom,
 			"client_prenom":    row.ClientPrenom,
diff --git a/backend/gestion/handlers/deleviry.go b/backend/gestion/handlers/deleviry.go
index 5ff17a05..81546cc2 100644
--- a/backend/gestion/handlers/deleviry.go
+++ b/backend/gestion/handlers/deleviry.go
@@ -59,9 +59,10 @@ func GetMyDeliveries(c *gin.Context) {
 		itemsSummary := make([]gin.H, len(items))
 		for j, item := range items {
 			itemsSummary[j] = gin.H{
-				"produit":  item["produit"],
-				"quantite": item["quantite"],
-				"prix":     item["prix"],
+				"produit":   item["produit"],
+				"quantite":  item["quantite"],
+				"prix":      item["prix"],
+				"is_reward": item["is_reward"],
 			}
 		}
 
diff --git a/frontend-admin/src/screens/delivery/DashboardScreen.tsx b/frontend-admin/src/screens/delivery/DashboardScreen.tsx
index 1be784ff..734ad1a5 100644
--- a/frontend-admin/src/screens/delivery/DashboardScreen.tsx
+++ b/frontend-admin/src/screens/delivery/DashboardScreen.tsx
@@ -75,7 +75,7 @@ interface EnrichedDelivery extends DeliveryItem {
     clientUsername?: string;
     clientNom?: string;
     clientPrenom?: string;
-    items?: Array<{ produit: string; quantite: number; prix: number; unit?: string }>;
+    items?: Array<{ produit: string; quantite: number; prix: number; unit?: string; is_reward?: boolean }>;
 }
 
 export default function DashboardScreen() {
@@ -699,18 +699,32 @@ export default function DashboardScreen() {
                                 Produits ({item.items.length})
                             </Text>
                         </View>
+                        {item.items.some(p => p.is_reward) && (
+                            <View style={{ flexDirection: "row", alignItems: "center", gap: 6, backgroundColor: "rgba(245,158,11,0.12)", borderRadius: 6, padding: 6, marginBottom: 6 }}>
+                                <Ionicons name="gift-outline" size={15} color="#f59e0b" />
+                                <Text style={{ fontSize: 13, color: "#f59e0b", fontWeight: "700" }}>
+                                    Cette commande contient un article offert (récompense client)
+                                </Text>
+                            </View>
+                        )}
                         {item.items.map((prod, idx) => (
                             <View key={idx} style={styles.itemRow}>
                                 <View style={{ flex: 1 }}>
-                                    <Text style={styles.itemName}>
-                                        {prod.produit}
-                                    </Text>
+                                    <View style={{ flexDirection: "row", alignItems: "center", gap: 4 }}>
+                                        <Text style={styles.itemName}>{prod.produit}</Text>
+                                        {prod.is_reward && (
+                                            <View style={{ flexDirection: "row", alignItems: "center", gap: 2, backgroundColor: "rgba(245,158,11,0.15)", borderRadius: 4, paddingHorizontal: 4, paddingVertical: 1 }}>
+                                                <Ionicons name="gift-outline" size={10} color="#f59e0b" />
+                                                <Text style={{ fontSize: 10, color: "#f59e0b", fontWeight: "700" }}>Offert</Text>
+                                            </View>
+                                        )}
+                                    </View>
                                     <Text style={styles.itemQty}>
                                         Quantité: {prod.quantite}{prod.unit || ""}
                                     </Text>
                                 </View>
-                                <Text style={styles.itemPrice}>
-                                    {(prod.prix ?? 0).toFixed(2)}€
+                                <Text style={[styles.itemPrice, prod.is_reward ? { color: "#10b981" } : {}]}>
+                                    {prod.is_reward ? "Offert" : `${(prod.prix ?? 0).toFixed(2)}€`}
                                 </Text>
                             </View>
                         ))}
@@ -1987,21 +2001,37 @@ export default function DashboardScreen() {
                     </Text>
                     {detailsDelivery?.items &&
                     detailsDelivery.items.length > 0 ? (
-                        detailsDelivery.items.map((prod, idx) => (
-                            <View key={idx} style={styles.detailProductRow}>
-                                <View style={{ flex: 1 }}>
-                                    <Text style={styles.detailProductName}>
-                                        {prod.produit}
-                                    </Text>
-                                    <Text style={styles.detailProductQty}>
-                                        Quantité : {prod.quantite}{prod.unit || ""}
+                        <>
+                            {detailsDelivery.items.some(p => p.is_reward) && (
+                                <View style={{ flexDirection: "row", alignItems: "center", gap: 6, backgroundColor: "rgba(245,158,11,0.12)", borderRadius: 8, padding: 8, marginBottom: 8 }}>
+                                    <Ionicons name="gift-outline" size={16} color="#f59e0b" />
+                                    <Text style={{ fontSize: 13, color: "#f59e0b", fontWeight: "700" }}>
+                                        Cette commande contient un article offert (récompense client)
                                     </Text>
                                 </View>
-                                <Text style={styles.detailProductPrice}>
-                                    {(prod.prix ?? 0).toFixed(2)}€
-                                </Text>
-                            </View>
-                        ))
+                            )}
+                            {detailsDelivery.items.map((prod, idx) => (
+                                <View key={idx} style={styles.detailProductRow}>
+                                    <View style={{ flex: 1 }}>
+                                        <View style={{ flexDirection: "row", alignItems: "center", gap: 4 }}>
+                                            <Text style={styles.detailProductName}>{prod.produit}</Text>
+                                            {prod.is_reward && (
+                                                <View style={{ flexDirection: "row", alignItems: "center", gap: 2, backgroundColor: "rgba(245,158,11,0.15)", borderRadius: 4, paddingHorizontal: 4, paddingVertical: 1 }}>
+                                                    <Ionicons name="gift-outline" size={11} color="#f59e0b" />
+                                                    <Text style={{ fontSize: 11, color: "#f59e0b", fontWeight: "700" }}>Offert</Text>
+                                                </View>
+                                            )}
+                                        </View>
+                                        <Text style={styles.detailProductQty}>
+                                            Quantité : {prod.quantite}{prod.unit || ""}
+                                        </Text>
+                                    </View>
+                                    <Text style={[styles.detailProductPrice, prod.is_reward ? { color: "#10b981" } : {}]}>
+                                        {prod.is_reward ? "Offert" : `${(prod.prix ?? 0).toFixed(2)}€`}
+                                    </Text>
+                                </View>
+                            ))}
+                        </>
                     ) : (
                         <Text style={styles.detailEmpty}>Aucun produit</Text>
                     )}