@@ -349,8 +370,8 @@
detailToast.show();
}
- function formatCurrency(value) {
- return new Intl.NumberFormat('da-DK', { style: 'currency', currency: 'DKK' }).format(Number(value || 0));
+ function formatCurrency(value, currency = 'DKK') {
+ return new Intl.NumberFormat('da-DK', { style: 'currency', currency: currency || 'DKK' }).format(Number(value || 0));
}
function formatDate(dateStr) {
@@ -381,6 +402,7 @@
if (normalized === 'posted') return '
posted';
if (normalized === 'exported') return '
exported';
if (normalized === 'failed') return '
failed';
+ if (normalized === 'uncertain') return '
uafklaret';
return '
pending';
}
@@ -393,6 +415,32 @@
document.getElementById('lastSyncAt').textContent = formatDate(orderData.last_sync_at);
document.getElementById('economicOrderNumberView').textContent = orderData.economic_order_number || '-';
document.getElementById('economicInvoiceNumberView').textContent = orderData.economic_invoice_number || '-';
+ const showInvoice = ['posted', 'paid'].includes(String(orderData.sync_status || '').toLowerCase()) || Boolean(orderData.economic_invoice_number);
+ document.getElementById('invoiceNumberEditWrap').classList.toggle('d-none', !showInvoice);
+ document.getElementById('invoiceNumberViewWrap').classList.toggle('d-none', !showInvoice);
+ document.getElementById('forceExportWrap').classList.toggle('d-none', ['uncertain', 'exported', 'posted', 'paid'].includes(String(orderData.sync_status || '').toLowerCase()));
+
+ const hasReceipt = Boolean(orderData.economic_order_number || orderData.economic_export_id);
+ document.getElementById('exportReceiptCard').classList.toggle('d-none', !hasReceipt);
+ if (hasReceipt) {
+ document.getElementById('receiptOrderNumber').textContent = orderData.economic_order_number || '-';
+ document.getElementById('receiptCustomer').textContent = orderData.exported_economic_customer_number || orderData.current_economic_customer_number || '-';
+ const period = orderData.coverage_start && orderData.coverage_end
+ ? `${orderData.coverage_start} – ${orderData.coverage_end}`
+ : (String(orderData.invoice_aggregate_key || '').match(/\d{4}-\d{2}$/) || [])[0] || '-';
+ document.getElementById('receiptPeriod').textContent = period;
+ document.getElementById('receiptCurrencyLayout').textContent = `${orderData.exported_currency || 'DKK'} / ${orderData.exported_layout_number || orderData.layout_number || '-'}`;
+ document.getElementById('receiptUser').textContent = orderData.exported_by_name || '-';
+ document.getElementById('receiptExportedAt').textContent = formatDate(orderData.last_exported_at);
+ document.getElementById('receiptNetAmount').textContent = formatCurrency(orderData.exported_net_amount, orderData.exported_currency || 'DKK');
+ document.getElementById('receiptExportId').textContent = orderData.economic_export_id || orderData.export_idempotency_key || '-';
+ const createdProducts = Array.isArray(orderData.exported_created_products) ? orderData.exported_created_products : [];
+ document.getElementById('receiptProductsWrap').classList.toggle('d-none', !createdProducts.length);
+ document.getElementById('receiptProducts').textContent = createdProducts.join(', ');
+ const link = document.getElementById('economicOrderLink');
+ link.classList.toggle('d-none', !orderData.economic_order_url);
+ if (orderData.economic_order_url) link.href = orderData.economic_order_url;
+ }
}
function renderLines() {
@@ -597,13 +645,21 @@
document.getElementById('orderTitle').value = orderData.title || '';
document.getElementById('customerId').value = orderData.customer_id || '';
+ document.getElementById('customerIdentity').textContent = orderData.customer_name
+ ? `${orderData.customer_name} · e-conomic ${orderData.current_economic_customer_number || 'ikke koblet'}`
+ : '-';
document.getElementById('layoutNumber').value = orderData.layout_number || '';
document.getElementById('orderNotes').value = orderData.notes || '';
- const hasExported = orderData.last_exported_at ? true : false;
- document.getElementById('orderStatus').innerHTML = hasExported
+ const hasExported = ['exported', 'posted', 'paid'].includes(String(orderData.sync_status || '').toLowerCase());
+ const isUncertain = String(orderData.sync_status || '').toLowerCase() === 'uncertain';
+ document.getElementById('orderStatus').innerHTML = hasExported
? '
Eksporteret'
- : '
Ikke eksporteret';
+ : isUncertain ? '
Uafklaret'
+ : '
Ikke eksporteret';
+ const errorBanner = document.getElementById('exportErrorBanner');
+ errorBanner.textContent = orderData.last_export_error ? `Seneste eksportfejl: ${orderData.last_export_error}` : '';
+ errorBanner.classList.toggle('d-none', !orderData.last_export_error);
document.getElementById('createdAt').textContent = formatDate(orderData.created_at);
document.getElementById('updatedAt').textContent = formatDate(orderData.updated_at);
@@ -694,9 +750,18 @@
}
body.innerHTML = items.map((event) => {
- const payload = typeof event.event_payload === 'object'
- ? JSON.stringify(event.event_payload, null, 2)
- : String(event.event_payload || '');
+ const data = typeof event.event_payload === 'object' ? event.event_payload : {};
+ let payload = String(event.event_payload || '');
+ if (event.event_type === 'export_success') {
+ payload = `Ordre ${data.economic_order_number || '-'} · Kunde ${data.economic_customer_number || '-'} · ${data.currency || '-'} · Layout ${data.layout_number || '-'} · ${formatCurrency(data.net_amount, data.currency)}`;
+ if ((data.created_product_numbers || []).length) payload += ` · Oprettede varer: ${data.created_product_numbers.join(', ')}`;
+ } else if (event.event_type === 'export_attempt') {
+ payload = data.force_export ? 'Tvungen geneksport startet' : 'Eksport startet';
+ } else if (event.event_type === 'sync_status_manual_update') {
+ payload = `Manuel statusændring${data.economic_order_number ? ` · Ordre ${data.economic_order_number}` : ''}`;
+ } else if (typeof event.event_payload === 'object') {
+ payload = Object.entries(data).map(([key, value]) => `${key}: ${value ?? '-'}`).join(' · ');
+ }
return `
@@ -704,7 +769,7 @@
| ${escapeHtml(event.event_type || '-')} |
${escapeHtml(event.from_status || '-')} |
${escapeHtml(event.to_status || '-')} |
- ${escapeHtml(payload)} |
+ ${escapeHtml(payload)} |
`;
}).join('');
diff --git a/app/products/backend/economic_documents.py b/app/products/backend/economic_documents.py
index 4fd7283..c8fdc36 100644
--- a/app/products/backend/economic_documents.py
+++ b/app/products/backend/economic_documents.py
@@ -115,8 +115,16 @@ async def preflight(connection, customer_id, lines, layout_number=None, currency
def result_for(row):
key = 'economic_order_number' if row['kind'] == 'order' else 'economic_invoice_number'
+ snapshot = row.get('snapshot') or {}
+ payload = snapshot.get('payload') or {}
+ response = row.get('response') or {}
return {'success': True, 'dry_run': False, key: row['economic_number'],
'economic_draft_id': row['economic_number'], 'export_id': str(row['id']),
+ 'details': {'request_payload': payload, 'economic_response': response,
+ 'economic_customer_number': (payload.get('customer') or {}).get('customerNumber'),
+ 'currency': payload.get('currency'),
+ 'layout_number': (payload.get('layout') or {}).get('layoutNumber'),
+ 'economic_order_url': response.get('self'), 'created_product_numbers': []},
'message': 'Eksporteret til e-conomic-kladde'}
diff --git a/migrations/245_ordre_export_receipt.sql b/migrations/245_ordre_export_receipt.sql
new file mode 100644
index 0000000..3101fa9
--- /dev/null
+++ b/migrations/245_ordre_export_receipt.sql
@@ -0,0 +1,32 @@
+-- Persist the evidence needed to reconcile an order draft with e-conomic.
+BEGIN;
+
+ALTER TABLE ordre_drafts
+ADD COLUMN IF NOT EXISTS economic_export_id VARCHAR(120),
+ADD COLUMN IF NOT EXISTS economic_order_url TEXT,
+ADD COLUMN IF NOT EXISTS exported_economic_customer_number VARCHAR(80),
+ADD COLUMN IF NOT EXISTS exported_currency VARCHAR(3),
+ADD COLUMN IF NOT EXISTS exported_layout_number INTEGER,
+ADD COLUMN IF NOT EXISTS exported_net_amount NUMERIC(18,2),
+ADD COLUMN IF NOT EXISTS export_request_json JSONB,
+ADD COLUMN IF NOT EXISTS export_response_json JSONB,
+ADD COLUMN IF NOT EXISTS exported_created_products JSONB NOT NULL DEFAULT '[]'::jsonb,
+ADD COLUMN IF NOT EXISTS last_export_error TEXT,
+ADD COLUMN IF NOT EXISTS exported_by_user_id INTEGER REFERENCES users(user_id) ON DELETE SET NULL;
+
+ALTER TABLE ordre_drafts DROP CONSTRAINT IF EXISTS ordre_drafts_sync_status_check;
+ALTER TABLE ordre_drafts ADD CONSTRAINT ordre_drafts_sync_status_check
+CHECK (sync_status IN ('pending', 'uncertain', 'exported', 'failed', 'posted', 'paid'));
+
+UPDATE ordre_drafts
+SET sync_status = 'uncertain',
+ last_export_error = COALESCE(last_export_error, 'Tidligere eksport: eksport markeret gennemført uden gemt e-conomic-ordrenummer; afstem manuelt før ny eksport')
+WHERE sync_status IN ('exported', 'posted', 'paid')
+ AND economic_order_number IS NULL;
+
+UPDATE ordre_drafts
+SET title = 'Abonnementer'
+WHERE invoice_aggregate_key LIKE 'also-cloud-%'
+ AND title LIKE 'ALSO Cloud %';
+
+COMMIT;
diff --git a/tests/test_order_economic_safety_config.py b/tests/test_order_economic_safety_config.py
index 127f1a4..22d1a66 100644
--- a/tests/test_order_economic_safety_config.py
+++ b/tests/test_order_economic_safety_config.py
@@ -94,3 +94,15 @@ def test_legacy_draft_id_is_saved_as_order_number():
from app.modules.orders.backend.router import _economic_order_number
assert _economic_order_number({"economic_draft_id": 4711}) == 4711
+
+
+def test_exported_status_requires_economic_order_number():
+ from fastapi import HTTPException
+ from app.modules.orders.backend.router import _validate_sync_status_number
+
+ try:
+ _validate_sync_status_number("exported", None, None)
+ assert False, "exported status without an external order number must be rejected"
+ except HTTPException as exc:
+ assert exc.status_code == 409
+ _validate_sync_status_number("exported", None, "4711")