mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-11 17:27:31 +02:00
Restore visibility of linked order and delivery information in calendar views
Update storage logic to include associated deliveries within order details and link orders to delivery details. Replit-Commit-Author: Agent Replit-Commit-Session-Id: 7c468936-2a88-4686-ac0a-84921a45222d Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/7c468936-2a88-4686-ac0a-84921a45222d/tzcQQt9
This commit is contained in:
1 parent
eaf2de6960
commit
00a95954d0
2 files changed
+32
-3
No files matched your search
+30
-2
@@ -1563,11 +1563,23 @@ export class MemStorage implements IStorage {
|
||||
async getOrder(id: number): Promise<OrderWithRelations | undefined> {
|
||||
const order = this.orders.get(id);
|
||||
if (!order) return undefined;
|
||||
|
||||
// Récupérer les livraisons associées à cette commande
|
||||
const associatedDeliveries = Array.from(this.deliveries.values())
|
||||
.filter(delivery => delivery.orderId === id)
|
||||
.map(delivery => ({
|
||||
...delivery,
|
||||
supplier: this.suppliers.get(delivery.supplierId),
|
||||
group: this.groups.get(delivery.groupId),
|
||||
creator: this.users.get(delivery.createdBy || '')
|
||||
}));
|
||||
|
||||
return {
|
||||
...order,
|
||||
supplier: this.suppliers.get(order.supplierId),
|
||||
group: this.groups.get(order.groupId),
|
||||
creator: this.users.get(order.createdBy)
|
||||
creator: this.users.get(order.createdBy),
|
||||
deliveries: associatedDeliveries
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1636,11 +1648,27 @@ export class MemStorage implements IStorage {
|
||||
async getDelivery(id: number): Promise<DeliveryWithRelations | undefined> {
|
||||
const delivery = this.deliveries.get(id);
|
||||
if (!delivery) return undefined;
|
||||
|
||||
// Récupérer la commande associée si elle existe
|
||||
let associatedOrder = undefined;
|
||||
if (delivery.orderId) {
|
||||
const order = this.orders.get(delivery.orderId);
|
||||
if (order) {
|
||||
associatedOrder = {
|
||||
...order,
|
||||
supplier: this.suppliers.get(order.supplierId),
|
||||
group: this.groups.get(order.groupId),
|
||||
creator: this.users.get(order.createdBy)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
...delivery,
|
||||
supplier: this.suppliers.get(delivery.supplierId),
|
||||
group: this.groups.get(delivery.groupId),
|
||||
creator: this.users.get(delivery.createdBy || '')
|
||||
creator: this.users.get(delivery.createdBy || ''),
|
||||
order: associatedOrder
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user