u

src/services/companyExport.js

@@ -506,11 +506,23 @@ export async function executeCompanyExport({
                 log.warn('Could not prefetch payment/shipping types:', err.message);
             }
 
+            const entityMap = new Map();
+            try {
+                const entities = await store.entity.list(googleAuthId);
+                for (const ent of entities) {
+                    entityMap.set(ent.id, ent);
+                }
+            } catch (err) {
+                log.warn('Could not prefetch entities for order export:', err.message);
+            }
+
             const manifestCsvHeaders = [
                 '"id"',
                 '"nr"',
                 '"extnr"',
                 '"created_at"',
+                '"customerNr"',
+                '"customerName"',
                 '"paymentType"',
                 '"shippingType"',
                 '"payed"',
@@ -543,11 +555,21 @@ export async function executeCompanyExport({
                     const payType = paymentMap.get(ord.id) || ord.payment?.type || ord.payments?.[0]?.type || 'Bar';
                     const shipType = shippingMap.get(ord.id) || ord.shipping?.type || ord.shippings?.[0]?.type || 'Selbstabholer';
 
+                    const entity = ord.entity || (ord.entityId ? entityMap.get(ord.entityId) : null);
+                    const customerNr = ord.customerNr || entity?.number || ord.customer?.number || '';
+                    const customerName = ord.customerName
+                        || entity?.name
+                        || [entity?.firstName, entity?.lastName].filter(Boolean).join(' ')
+                        || [ord.customerFirstName, ord.customerLastName].filter(Boolean).join(' ')
+                        || '';
+
                     manifestCsvRows.push([
                         formatCsvField(ord.id),
                         formatCsvField(ord.number),
                         formatCsvField(ord.externalNumber || ''),
                         formatCsvField(ord.createdAt || ord.date || new Date().toISOString()),
+                        formatCsvField(customerNr),
+                        formatCsvField(customerName),
                         formatCsvField(payType),
                         formatCsvField(shipType),
                         formatCsvField(ord.isPaid || ord.paid ? '1' : '0'),