chore: fix product
This commit is contained in:
@@ -76,7 +76,11 @@ export const getMyDeliveries = async (): Promise<{
|
||||
}> => {
|
||||
try {
|
||||
const { data } = await apiClient.get(`${API}/deliveries`);
|
||||
return { success: true, deliveries: data.deliveries || [] };
|
||||
// Le backend inclut déjà items et client_info dans chaque livraison
|
||||
const deliveries: DeliveryItem[] = (data.deliveries || []).map(
|
||||
(d: any) => ({ ...d, items: d.items || [] }),
|
||||
);
|
||||
return { success: true, deliveries };
|
||||
} catch (error: any) {
|
||||
return {
|
||||
success: false,
|
||||
@@ -94,11 +98,17 @@ export const getDeliveryDetails = async (
|
||||
}> => {
|
||||
try {
|
||||
const { data } = await apiClient.get(`${API}/deliveries/${deliveryId}`);
|
||||
// Le backend retourne { delivery: { id, status, adresse, items, ... }, success: true }
|
||||
// Les items sont dans data.delivery.items, pas dans data.client_info
|
||||
const deliveryObj = data.delivery || {};
|
||||
return {
|
||||
success: true,
|
||||
delivery: {
|
||||
delivery: data.delivery,
|
||||
client_info: data.client_info,
|
||||
delivery: {
|
||||
...deliveryObj,
|
||||
items: deliveryObj.items || [],
|
||||
},
|
||||
client_info: deliveryObj.client_info || data.client_info || {},
|
||||
},
|
||||
};
|
||||
} catch (error: any) {
|
||||
|
||||
@@ -112,6 +112,12 @@ export interface QueueInfo {
|
||||
commands: any[];
|
||||
}
|
||||
|
||||
export interface DeliveryItemProduct {
|
||||
produit: string;
|
||||
quantite: number;
|
||||
prix: number;
|
||||
}
|
||||
|
||||
export interface DeliveryItem {
|
||||
id: number;
|
||||
status: string;
|
||||
@@ -120,6 +126,8 @@ export interface DeliveryItem {
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
eta?: string;
|
||||
items?: DeliveryItemProduct[];
|
||||
items_count?: number;
|
||||
}
|
||||
|
||||
export interface ClientInfo {
|
||||
|
||||
@@ -970,7 +970,7 @@ export default function ProductsScreen() {
|
||||
v,
|
||||
)
|
||||
}
|
||||
keyboardType="numeric"
|
||||
keyboardType="decimal-pad"
|
||||
placeholderTextColor={
|
||||
colors.textMuted
|
||||
}
|
||||
|
||||
@@ -228,7 +228,7 @@ export default function DashboardScreen() {
|
||||
: client?.username || undefined,
|
||||
clientPhone: client?.telephone || undefined,
|
||||
items:
|
||||
(detail.delivery as any)?.items ||
|
||||
detail.delivery?.items ||
|
||||
(d as any).items ||
|
||||
[],
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user