merge(main): resolve conflicts keeping codefou + email on suppliers

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Sonnet 4.6 committed 2026-05-15 11:14:35 +02:00
commit b8ecacee3b
20 files changed
+719 -299

No files matched your search

+3 -1
View File
@@ -1883,11 +1883,13 @@ export class DatabaseStorage implements IStorage {
}));
}
async markClientCalled(customerOrderId: number, calledBy: string): Promise<CustomerOrder> {
async markClientCalled(customerOrderId: number, calledBy: string, comment?: string): Promise<CustomerOrder> {
const [updated] = await db
.update(customerOrders)
.set({
customerNotified: true,
notifiedAt: new Date(),
notifiedComment: comment || null,
updatedAt: new Date()
})
.where(eq(customerOrders.id, customerOrderId))