feat: add CSV export for approved orders && add non-delivery reason modal for livreurs
This commit is contained in:
@@ -126,6 +126,13 @@ export const getCommandItems = async (commandId: number) => {
|
||||
};
|
||||
};
|
||||
|
||||
export const exportApprovedCommandsCSV = async (): Promise<string> => {
|
||||
const { data } = await apiClient.get(`${V2}/admin/protected/orders/export/csv`, {
|
||||
responseType: "text",
|
||||
});
|
||||
return data as string;
|
||||
};
|
||||
|
||||
export const deleteCommand = async (commandId: number) => {
|
||||
const { data } = await apiClient.delete(
|
||||
`${V2}/admin/protected/orders/${commandId}`,
|
||||
|
||||
@@ -367,3 +367,34 @@ export const unlinkLivreurTelegram = async (): Promise<void> => {
|
||||
/* ignore */
|
||||
}
|
||||
};
|
||||
|
||||
export type IssueType =
|
||||
| "client_absent"
|
||||
| "wrong_address"
|
||||
| "refused_delivery"
|
||||
| "no_access"
|
||||
| "other";
|
||||
|
||||
export const ISSUE_LABELS: Record<IssueType, string> = {
|
||||
client_absent: "Client absent",
|
||||
wrong_address: "Adresse incorrecte",
|
||||
refused_delivery: "Livraison refusée",
|
||||
no_access: "Accès impossible",
|
||||
other: "Autre",
|
||||
};
|
||||
|
||||
export const reportDeliveryIssue = async (
|
||||
deliveryId: number,
|
||||
issueType: IssueType,
|
||||
description: string,
|
||||
): Promise<{ success: boolean; error?: string }> => {
|
||||
try {
|
||||
await apiClient.post(`${API}/deliveries/${deliveryId}/issue`, {
|
||||
issue_type: issueType,
|
||||
description,
|
||||
});
|
||||
return { success: true };
|
||||
} catch (e: any) {
|
||||
return { success: false, error: e?.response?.data?.error || "Erreur" };
|
||||
}
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
RefreshControl,
|
||||
ScrollView,
|
||||
TextInput,
|
||||
Share,
|
||||
} from "react-native";
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
@@ -25,6 +26,7 @@ import {
|
||||
deleteCommand,
|
||||
deleteCommandItem,
|
||||
proposeAddressChangeAdmin,
|
||||
exportApprovedCommandsCSV,
|
||||
} from "../../api/api_admin";
|
||||
import type { CommandResponse } from "../../api/types";
|
||||
import type { AdminStackParamList } from "../../navigation/types";
|
||||
@@ -73,6 +75,8 @@ export default function OrdersScreen() {
|
||||
clientInfo: null,
|
||||
});
|
||||
|
||||
const [exporting, setExporting] = useState(false);
|
||||
|
||||
const loadData = useCallback(async () => {
|
||||
try {
|
||||
const result = await getAllCommands(undefined);
|
||||
@@ -83,6 +87,18 @@ export default function OrdersScreen() {
|
||||
setLoading(false);
|
||||
}, []);
|
||||
|
||||
const handleExportCSV = async () => {
|
||||
setExporting(true);
|
||||
try {
|
||||
const csv = await exportApprovedCommandsCSV();
|
||||
await Share.share({ message: csv, title: "Commandes approuvées" });
|
||||
} catch {
|
||||
showError("Erreur lors de l'export CSV");
|
||||
} finally {
|
||||
setExporting(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadData();
|
||||
}, [loadData]);
|
||||
@@ -238,8 +254,10 @@ export default function OrdersScreen() {
|
||||
StyleSheet.create({
|
||||
container: { flex: 1, backgroundColor: colors.bgPrimary },
|
||||
refreshRow: {
|
||||
flexDirection: "row",
|
||||
gap: spacing.s,
|
||||
paddingBottom: spacing.m,
|
||||
alignItems: "flex-start",
|
||||
alignItems: "center",
|
||||
},
|
||||
refreshBtn: {
|
||||
flexDirection: "row",
|
||||
@@ -604,6 +622,20 @@ export default function OrdersScreen() {
|
||||
/>
|
||||
<Text style={styles.refreshBtnText}>Actualiser</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
style={styles.refreshBtn}
|
||||
onPress={handleExportCSV}
|
||||
disabled={exporting}
|
||||
>
|
||||
<Ionicons
|
||||
name="download-outline"
|
||||
size={16}
|
||||
color={exporting ? colors.textMuted : colors.accent}
|
||||
/>
|
||||
<Text style={styles.refreshBtnText}>
|
||||
{exporting ? "Export..." : "Export CSV"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
}
|
||||
ListEmptyComponent={
|
||||
|
||||
@@ -39,7 +39,10 @@ import {
|
||||
generateLivreurLinkToken,
|
||||
unlinkLivreurTelegram,
|
||||
getDeliveryNavLink,
|
||||
reportDeliveryIssue,
|
||||
ISSUE_LABELS,
|
||||
} from "../../api/api_delivery";
|
||||
import type { IssueType } from "../../api/api_delivery";
|
||||
import { geocodeAddress, calculateRoute } from "../../api/tomtom";
|
||||
import type { RouteInfo } from "../../api/tomtom";
|
||||
import type { DeliveryStatus, DeliveryItem, QueueInfo } from "../../api/types";
|
||||
@@ -118,8 +121,9 @@ export default function DashboardScreen() {
|
||||
const [cancelModal, setCancelModal] = useState<{
|
||||
visible: boolean;
|
||||
deliveryId: number | null;
|
||||
reason: string;
|
||||
}>({ visible: false, deliveryId: null, reason: "" });
|
||||
issueType: IssueType | null;
|
||||
description: string;
|
||||
}>({ visible: false, deliveryId: null, issueType: null, description: "" });
|
||||
|
||||
const STATUS_COLORS: Record<string, string> = useMemo(
|
||||
() => ({
|
||||
@@ -502,17 +506,25 @@ export default function DashboardScreen() {
|
||||
};
|
||||
|
||||
const handleCancelDelivery = async () => {
|
||||
if (!cancelModal.deliveryId) return;
|
||||
if (!cancelModal.deliveryId || !cancelModal.issueType) return;
|
||||
const lat = lastCoords?.lat || 0;
|
||||
const lng = lastCoords?.lng || 0;
|
||||
const issueLabel = ISSUE_LABELS[cancelModal.issueType];
|
||||
const res = await updateDeliveryStatus(
|
||||
cancelModal.deliveryId,
|
||||
"cancelled",
|
||||
lat,
|
||||
lng,
|
||||
cancelModal.reason || "Client absent",
|
||||
cancelModal.description || issueLabel,
|
||||
);
|
||||
setCancelModal({ visible: false, deliveryId: null, reason: "" });
|
||||
if (res.success) {
|
||||
await reportDeliveryIssue(
|
||||
cancelModal.deliveryId,
|
||||
cancelModal.issueType,
|
||||
cancelModal.description,
|
||||
);
|
||||
}
|
||||
setCancelModal({ visible: false, deliveryId: null, issueType: null, description: "" });
|
||||
if (res.success) {
|
||||
showSuccess("Succès", "Livraison annulée");
|
||||
loadData();
|
||||
@@ -736,7 +748,8 @@ export default function DashboardScreen() {
|
||||
setCancelModal({
|
||||
visible: true,
|
||||
deliveryId: item.id,
|
||||
reason: "",
|
||||
issueType: null,
|
||||
description: "",
|
||||
})
|
||||
}
|
||||
style={{ flex: 1, backgroundColor: colors.danger }}
|
||||
@@ -1860,24 +1873,51 @@ export default function DashboardScreen() {
|
||||
<DetailsModal
|
||||
visible={cancelModal.visible}
|
||||
onClose={() =>
|
||||
setCancelModal({ visible: false, deliveryId: null, reason: "" })
|
||||
setCancelModal({ visible: false, deliveryId: null, issueType: null, description: "" })
|
||||
}
|
||||
title="Annuler la livraison"
|
||||
title="Motif de non-livraison"
|
||||
icon="close-circle-outline"
|
||||
>
|
||||
<Text style={[styles.cancelInput, { color: colors.textSecondary, fontSize: 13, marginBottom: spacing.s, backgroundColor: "transparent", borderWidth: 0, padding: 0 }]}>
|
||||
Sélectionnez un motif
|
||||
</Text>
|
||||
<View style={{ flexDirection: "row", flexWrap: "wrap", gap: spacing.s, marginBottom: spacing.m }}>
|
||||
{(Object.keys(ISSUE_LABELS) as IssueType[]).map((type) => {
|
||||
const selected = cancelModal.issueType === type;
|
||||
return (
|
||||
<TouchableOpacity
|
||||
key={type}
|
||||
onPress={() => setCancelModal((prev) => ({ ...prev, issueType: type }))}
|
||||
style={{
|
||||
paddingHorizontal: spacing.m,
|
||||
paddingVertical: spacing.s,
|
||||
borderRadius: 20,
|
||||
borderWidth: 1,
|
||||
borderColor: selected ? colors.danger : colors.border,
|
||||
backgroundColor: selected ? colors.danger + "22" : colors.bgCard,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: selected ? colors.danger : colors.textSecondary, fontSize: 13 }}>
|
||||
{ISSUE_LABELS[type]}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
<TextInput
|
||||
style={styles.cancelInput}
|
||||
placeholder="Motif (ex: client absent)..."
|
||||
placeholder="Précisions (facultatif)..."
|
||||
placeholderTextColor={colors.textMuted}
|
||||
value={cancelModal.reason}
|
||||
value={cancelModal.description}
|
||||
onChangeText={(t) =>
|
||||
setCancelModal((prev) => ({ ...prev, reason: t }))
|
||||
setCancelModal((prev) => ({ ...prev, description: t }))
|
||||
}
|
||||
multiline
|
||||
/>
|
||||
<TouchableOpacity
|
||||
style={styles.cancelConfirmBtn}
|
||||
style={[styles.cancelConfirmBtn, !cancelModal.issueType && { opacity: 0.4 }]}
|
||||
onPress={handleCancelDelivery}
|
||||
disabled={!cancelModal.issueType}
|
||||
>
|
||||
<Text style={styles.cancelConfirmText}>Confirmer l'annulation</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
Reference in New Issue
Block a user