-
${line.quantity} timer × ${parseFloat(line.unit_price).toFixed(2)} DKK
-
${new Date(line.time_date).toLocaleDateString('da-DK')}
+ ${order.lines.map(line => {
+ // Parse data
+ const caseMatch = line.description.match(/CC(\d+)/);
+ const caseTitle = line.description.split(' - ').slice(1).join(' - ') || line.description;
+ const hours = parseFloat(line.quantity);
+ const unitPrice = parseFloat(line.unit_price);
+ const total = parseFloat(line.line_total);
+ const date = new Date(line.time_date).toLocaleDateString('da-DK');
+
+ // Extract contact name from case_contact if available
+ const contactName = line.case_contact || 'Ingen kontakt';
+
+ // Check if it's an on-site visit (udkørsel)
+ const isOnSite = line.description.toLowerCase().includes('udkørsel') ||
+ line.description.toLowerCase().includes('on-site');
+
+ return `
+
+
+
+
+ ${caseMatch ? `${caseMatch[0]}` : ''}
+ ${hours.toFixed(1)} timer
+ ×
+ ${unitPrice.toFixed(2)} DKK
+
+
+ ${caseTitle}
+
+
+ ${date} - ${contactName}${isOnSite ? ' Udkørsel' : ''}
+
+
+
+
${total.toFixed(2)} DKK
+
- `).join('')}
+ `;
+ }).join('')}
- ${order.exported_to_economic ? `
+ ${order.economic_draft_id ? `
Eksporteret til e-conomic den ${new Date(order.exported_at).toLocaleDateString('da-DK')}
- ${order.economic_draft_invoice_number ? `
Kladde nr.: ${order.economic_draft_invoice_number}` : ''}
+
Draft Order nr.: ${order.economic_draft_id}
+ ${order.economic_order_number ? `
e-conomic ordre nr.: ${order.economic_order_number}` : ''}
` : ''}
`;
// Update export button
const exportBtn = document.getElementById('export-order-btn');
- if (order.exported_to_economic) {
- exportBtn.disabled = true;
- exportBtn.innerHTML = '
Allerede eksporteret';
+ if (order.economic_draft_id) {
+ exportBtn.disabled = false;
+ exportBtn.innerHTML = '
Re-eksporter (force)';
+ exportBtn.onclick = () => {
+ if (confirm('Re-eksporter ordre til e-conomic?\n\nDette vil overskrive den eksisterende draft order.')) {
+ exportOrderForce(currentOrderId);
+ }
+ };
} else {
exportBtn.disabled = false;
exportBtn.innerHTML = '
Eksporter til e-conomic';
+ exportBtn.onclick = exportCurrentOrder;
}
orderModal.show();
@@ -432,25 +485,39 @@
// Export order
async function exportOrder(orderId) {
- if (!confirm('Eksporter ordre til e-conomic?\n\nDette opretter en kladde-faktura i e-conomic.')) {
+ if (!confirm('Eksporter ordre til e-conomic?\n\nDette opretter en kladde-ordre i e-conomic.')) {
return;
}
try {
- const response = await fetch(`/api/v1/timetracking/export/${orderId}`, {
- method: 'POST'
+ const response = await fetch(`/api/v1/timetracking/export`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ order_id: orderId,
+ force: false
+ })
});
+
+ if (!response.ok) {
+ const errorData = await response.json();
+ throw new Error(errorData.detail || 'Export failed');
+ }
+
const result = await response.json();
if (result.dry_run) {
- alert(`DRY-RUN MODE:\n\nFakturaen ville blive oprettet med:\n- Kladde nr.: ${result.draft_invoice_number}\n- Total: ${result.total_amount} DKK\n\nIngen ændringer er foretaget i e-conomic.`);
+ alert(`DRY-RUN MODE:\n\n${result.message}\n\nDetails:\n- Ordre: ${result.details.order_number}\n- Kunde: ${result.details.customer_name}\n- Total: ${result.details.total_amount} DKK\n- Linjer: ${result.details.line_count}\n\n⚠️ Ingen ændringer er foretaget i e-conomic (DRY-RUN mode aktiveret).`);
+ } else if (result.success) {
+ alert(`✅ Ordre eksporteret til e-conomic!\n\n- Draft Order nr.: ${result.economic_draft_id}\n- e-conomic ordre nr.: ${result.economic_order_number}\n\n${result.message}`);
+ loadOrders();
+ if (orderModal._isShown) {
+ orderModal.hide();
+ }
} else {
- alert(`Ordre eksporteret!\n\nKladde nr.: ${result.draft_invoice_number}\nTotal: ${result.total_amount} DKK`);
- }
-
- loadOrders();
- if (orderModal._isShown) {
- orderModal.hide();
+ throw new Error(result.message || 'Export failed');
}
} catch (error) {
@@ -464,6 +531,44 @@
exportOrder(currentOrderId);
}
}
+
+ // Force re-export order
+ async function exportOrderForce(orderId) {
+ try {
+ const response = await fetch(`/api/v1/timetracking/export`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ order_id: orderId,
+ force: true
+ })
+ });
+
+ if (!response.ok) {
+ const errorData = await response.json();
+ throw new Error(errorData.detail || 'Export failed');
+ }
+
+ const result = await response.json();
+
+ if (result.dry_run) {
+ alert(`DRY-RUN MODE:\n\n${result.message}\n\n⚠️ Ingen ændringer er foretaget i e-conomic (DRY-RUN mode aktiveret).`);
+ } else if (result.success) {
+ alert(`✅ Ordre re-eksporteret til e-conomic!\n\n- Draft Order nr.: ${result.economic_draft_id}\n- e-conomic ordre nr.: ${result.economic_order_number}`);
+ loadOrders();
+ if (orderModal._isShown) {
+ orderModal.hide();
+ }
+ } else {
+ throw new Error(result.message || 'Export failed');
+ }
+
+ } catch (error) {
+ alert('Fejl ved eksport: ' + error.message);
+ }
+ }