-
- ${lineItems.map(line => `
-
-
-
${escapeHtml(line.product_name || line.productid)}
-
- ${line.quantity || 0} stk × ${parseFloat(line.listprice || 0).toFixed(2)} DKK
-
-
-
- ${parseFloat(line.netprice || 0).toFixed(2)} DKK
-
-
- `).join('')}
-
- Subtotal:
- ${parseFloat(sub.hdnSubTotal || 0).toFixed(2)} DKK
-
-
-
Total inkl. moms:
-
${total.toFixed(2)} DKK
+
+
+ Indlæser...
+
Henter produktlinjer...
- ` : ''}
`;
}).join('');
@@ -1041,7 +1134,7 @@ async function loadActivity() {
}, 500);
}
-function toggleLineItems(itemId) {
+async function toggleSubscriptionDetails(subscriptionId, itemId) {
const linesDiv = document.getElementById(`${itemId}-lines`);
const icon = document.getElementById(`${itemId}-icon`);
@@ -1053,12 +1146,85 @@ function toggleLineItems(itemId) {
linesDiv.style.display = 'block';
if (icon) icon.className = 'bi bi-chevron-down me-2 text-primary';
if (item) item.classList.add('expanded');
+
+ // Fetch line items if not already loaded
+ if (linesDiv.querySelector('.spinner-border')) {
+ try {
+ const response = await fetch(`/api/v1/subscriptions/${subscriptionId}`);
+ const data = await response.json();
+
+ if (data.status === 'success') {
+ const sub = data.subscription;
+ const lineItems = sub.LineItems || [];
+ const total = parseFloat(sub.hdnGrandTotal || 0);
+
+ if (lineItems.length > 0) {
+ linesDiv.innerHTML = `
+
+
+ Produktlinjer:
+
+
+ For at ændre priser, klik "Åbn i vTiger"
+
+
+ ${lineItems.map(line => `
+
+
+
${escapeHtml(line.product_name || line.productid)}
+
+ ${line.quantity} stk × ${parseFloat(line.listprice).toFixed(2)} DKK
+
+ ${line.comment ? `
${escapeHtml(line.comment)}
` : ''}
+
+
+ ${parseFloat(line.netprice || 0).toFixed(2)} DKK
+
+
+ `).join('')}
+
+ Subtotal:
+ ${parseFloat(sub.hdnSubTotal || 0).toFixed(2)} DKK
+
+
+ Total inkl. moms:
+ ${total.toFixed(2)} DKK
+
+
+ `;
+ } else {
+ linesDiv.innerHTML = '
Ingen produktlinjer
';
+ }
+ } else {
+ linesDiv.innerHTML = '
Kunne ikke hente produktlinjer
';
+ }
+ } catch (error) {
+ console.error('Error fetching subscription details:', error);
+ linesDiv.innerHTML = '
Fejl ved indlæsning
';
+ }
+ }
} else {
linesDiv.style.display = 'none';
- if (icon) {
- const isSubscription = itemId.includes('subscription');
- icon.className = `bi bi-chevron-right me-2 ${isSubscription ? 'text-primary' : 'text-success'}`;
- }
+ if (icon) icon.className = 'bi bi-chevron-right me-2 text-primary';
+ if (item) item.classList.remove('expanded');
+ }
+}
+
+function toggleLineItems(itemId) {
+ const linesDiv = document.getElementById(`${itemId}-lines`);
+ const icon = document.getElementById(`${itemId}-icon`);
+
+ if (!linesDiv) return;
+
+ const item = linesDiv.closest('.subscription-item');
+
+ if (linesDiv.style.display === 'none') {
+ linesDiv.style.display = 'block';
+ if (icon) icon.className = 'bi bi-chevron-down me-2 text-success';
+ if (item) item.classList.add('expanded');
+ } else {
+ linesDiv.style.display = 'none';
+ if (icon) icon.className = 'bi bi-chevron-right me-2 text-success';
if (item) item.classList.remove('expanded');
}
}
@@ -1073,6 +1239,117 @@ function showAddContactModal() {
console.log('Add contact for customer:', customerId);
}
+// Subscription management functions
+let currentSubscriptions = [];
+
+function showCreateSubscriptionModal() {
+ if (!customerData || !customerData.vtiger_id) {
+ alert('Kunden er ikke linket til vTiger');
+ return;
+ }
+
+ const modal = new bootstrap.Modal(document.getElementById('subscriptionModal'));
+ document.getElementById('subscriptionModalLabel').textContent = 'Opret Nyt Abonnement';
+ document.getElementById('subscriptionForm').reset();
+ document.getElementById('subscriptionId').value = '';
+ modal.show();
+}
+
+async function editSubscription(subscriptionId, event) {
+ event.stopPropagation();
+
+ // Find subscription data
+ const sub = currentSubscriptions.find(s => s.id === subscriptionId);
+ if (!sub) {
+ alert('Abonnement ikke fundet');
+ return;
+ }
+
+ // Fill form
+ document.getElementById('subscriptionId').value = subscriptionId;
+ document.getElementById('subjectInput').value = sub.subject || '';
+ document.getElementById('startdateInput').value = sub.startdate || '';
+ document.getElementById('enddateInput').value = sub.enddate || '';
+ document.getElementById('frequencyInput').value = sub.generateinvoiceevery || 'Monthly';
+ document.getElementById('statusInput').value = sub.subscriptionstatus || 'Active';
+
+ // Show modal
+ const modal = new bootstrap.Modal(document.getElementById('subscriptionModal'));
+ document.getElementById('subscriptionModalLabel').textContent = 'Rediger Abonnement';
+ modal.show();
+}
+
+async function deleteSubscription(subscriptionId, event) {
+ event.stopPropagation();
+
+ if (!confirm('Er du sikker på at du vil slette dette abonnement?')) {
+ return;
+ }
+
+ try {
+ const response = await fetch(`/api/v1/subscriptions/${subscriptionId}`, {
+ method: 'DELETE'
+ });
+
+ if (!response.ok) {
+ throw new Error('Failed to delete subscription');
+ }
+
+ alert('Abonnement slettet');
+ loadSubscriptions(); // Reload
+ } catch (error) {
+ console.error('Error deleting subscription:', error);
+ alert('Kunne ikke slette abonnement: ' + error.message);
+ }
+}
+
+async function saveSubscription() {
+ const subscriptionId = document.getElementById('subscriptionId').value;
+ const isEdit = !!subscriptionId;
+
+ const data = {
+ subject: document.getElementById('subjectInput').value,
+ startdate: document.getElementById('startdateInput').value,
+ enddate: document.getElementById('enddateInput').value || null,
+ generateinvoiceevery: document.getElementById('frequencyInput').value,
+ subscriptionstatus: document.getElementById('statusInput').value,
+ products: [] // TODO: Add product picker
+ };
+
+ if (!isEdit) {
+ data.account_id = customerData.vtiger_id;
+ }
+
+ try {
+ let response;
+ if (isEdit) {
+ response = await fetch(`/api/v1/subscriptions/${subscriptionId}`, {
+ method: 'PUT',
+ headers: {'Content-Type': 'application/json'},
+ body: JSON.stringify(data)
+ });
+ } else {
+ response = await fetch(`/api/v1/customers/${customerId}/subscriptions`, {
+ method: 'POST',
+ headers: {'Content-Type': 'application/json'},
+ body: JSON.stringify(data)
+ });
+ }
+
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(error.detail || 'Failed to save subscription');
+ }
+
+ alert(isEdit ? 'Abonnement opdateret' : 'Abonnement oprettet');
+ bootstrap.Modal.getInstance(document.getElementById('subscriptionModal')).hide();
+ loadSubscriptions(); // Reload
+ } catch (error) {
+ console.error('Error saving subscription:', error);
+ alert('Kunne ikke gemme abonnement: ' + error.message);
+ }
+}
+
function getInitials(name) {
if (!name) return '?';
const words = name.trim().split(' ');
@@ -1085,5 +1362,39 @@ function escapeHtml(text) {
div.textContent = text;
return div.innerHTML;
}
+
+async function toggleSubscriptionsLock() {
+ const currentlyLocked = customerData?.subscriptions_locked || false;
+ const action = currentlyLocked ? 'låse op' : 'låse';
+
+ if (!confirm(`Er du sikker på at du vil ${action} abonnementer for denne kunde?\n\n${currentlyLocked ? 'Efter oplåsning kan abonnementer redigeres i BMC Hub.' : 'Efter låsning kan abonnementer kun redigeres direkte i vTiger.'}`)) {
+ return;
+ }
+
+ try {
+ const response = await fetch(`/api/v1/customers/${customerId}/subscriptions/lock`, {
+ method: 'POST',
+ headers: {'Content-Type': 'application/json'},
+ body: JSON.stringify({ locked: !currentlyLocked })
+ });
+
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(error.detail || 'Kunne ikke opdatere låsestatus');
+ }
+
+ const result = await response.json();
+
+ // Reload customer and subscriptions
+ await loadCustomer();
+ await loadSubscriptions();
+
+ alert(`✓ ${result.message}\n\n${result.note || ''}`);
+
+ } catch (error) {
+ console.error('Error toggling lock:', error);
+ alert('Fejl: ' + error.message);
+ }
+}
{% endblock %}
diff --git a/app/customers/frontend/customers.html b/app/customers/frontend/customers.html
index 7985aed..03345c2 100644
--- a/app/customers/frontend/customers.html
+++ b/app/customers/frontend/customers.html
@@ -224,18 +224,33 @@ let totalCustomers = 0;
document.addEventListener('DOMContentLoaded', () => {
loadCustomers();
+ const searchInput = document.getElementById('searchInput');
+
// Search with debounce
let searchTimeout;
- document.getElementById('searchInput').addEventListener('input', (e) => {
+ searchInput.addEventListener('input', (e) => {
clearTimeout(searchTimeout);
searchTimeout = setTimeout(() => {
searchQuery = e.target.value;
currentPage = 0;
+ console.log('🔍 Searching for:', searchQuery);
loadCustomers();
}, 300);
});
});
+// Cmd+K / Ctrl+K keyboard shortcut (outside DOMContentLoaded so it works everywhere)
+document.addEventListener('keydown', (e) => {
+ if ((e.metaKey || e.ctrlKey) && e.key === 'k') {
+ e.preventDefault();
+ const searchInput = document.getElementById('searchInput');
+ if (searchInput) {
+ searchInput.focus();
+ searchInput.select();
+ }
+ }
+});
+
function setFilter(filter) {
currentFilter = filter;
currentPage = 0;
@@ -262,6 +277,7 @@ async function loadCustomers() {
if (searchQuery) {
params.append('search', searchQuery);
+ console.log('📤 Sending search query:', searchQuery);
}
if (currentFilter === 'active') {
diff --git a/app/models/schemas.py b/app/models/schemas.py
index e9a0ca5..9a9968c 100644
--- a/app/models/schemas.py
+++ b/app/models/schemas.py
@@ -40,6 +40,7 @@ class CustomerUpdate(BaseModel):
city: Optional[str] = None
website: Optional[str] = None
is_active: Optional[bool] = None
+ subscriptions_locked: Optional[bool] = None
class Customer(CustomerBase):
diff --git a/app/modules/_template/README.md b/app/modules/_template/README.md
new file mode 100644
index 0000000..7c2ea43
--- /dev/null
+++ b/app/modules/_template/README.md
@@ -0,0 +1,137 @@
+# Template Module
+
+Dette er template strukturen for nye BMC Hub moduler.
+
+## Struktur
+
+```
+my_module/
+├── module.json # Metadata og konfiguration
+├── README.md # Dokumentation
+├── backend/
+│ ├── __init__.py
+│ └── router.py # FastAPI routes (API endpoints)
+├── frontend/
+│ ├── __init__.py
+│ └── views.py # HTML view routes
+├── templates/
+│ └── index.html # Jinja2 templates
+└── migrations/
+ └── 001_init.sql # Database migrations
+```
+
+## Opret nyt modul
+
+```bash
+python scripts/create_module.py my_module "My Module Description"
+```
+
+## Database Tables
+
+Alle tabeller SKAL bruge `table_prefix` fra module.json:
+
+```sql
+-- Hvis table_prefix = "mymod_"
+CREATE TABLE mymod_customers (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(255)
+);
+```
+
+Dette sikrer at moduler ikke kolliderer med core eller andre moduler.
+
+## Konfiguration
+
+Modul-specifikke miljøvariable følger mønsteret:
+
+```bash
+MODULES__MY_MODULE__API_KEY=secret123
+MODULES__MY_MODULE__READ_ONLY=true
+```
+
+Tilgå i kode:
+
+```python
+from app.core.config import get_module_config
+
+api_key = get_module_config("my_module", "API_KEY")
+read_only = get_module_config("my_module", "READ_ONLY", default="true") == "true"
+```
+
+## Database Queries
+
+Brug ALTID helper functions fra `app.core.database`:
+
+```python
+from app.core.database import execute_query, execute_insert
+
+# Fetch
+customers = execute_query(
+ "SELECT * FROM mymod_customers WHERE active = %s",
+ (True,)
+)
+
+# Insert
+customer_id = execute_insert(
+ "INSERT INTO mymod_customers (name) VALUES (%s)",
+ ("Test Customer",)
+)
+```
+
+## Migrations
+
+Migrations ligger i `migrations/` og køres manuelt eller via migration tool:
+
+```python
+from app.core.database import execute_module_migration
+
+with open("migrations/001_init.sql") as f:
+ migration_sql = f.read()
+
+success = execute_module_migration("my_module", migration_sql)
+```
+
+## Enable/Disable
+
+```bash
+# Enable via API
+curl -X POST http://localhost:8000/api/v1/modules/my_module/enable
+
+# Eller rediger module.json
+{
+ "enabled": true
+}
+
+# Restart app
+docker-compose restart api
+```
+
+## Fejlhåndtering
+
+Moduler er isolerede - hvis dit modul crasher ved opstart:
+- Core systemet kører videre
+- Modulet bliver ikke loaded
+- Fejl logges til console og logs/app.log
+
+Runtime fejl i endpoints påvirker ikke andre moduler.
+
+## Testing
+
+```python
+import pytest
+from app.core.database import execute_query
+
+def test_my_module():
+ # Test bruger samme database helpers
+ result = execute_query("SELECT 1 as test")
+ assert result[0]["test"] == 1
+```
+
+## Best Practices
+
+1. **Database isolering**: Brug ALTID `table_prefix` fra module.json
+2. **Safety switches**: Tilføj `READ_ONLY` og `DRY_RUN` flags
+3. **Error handling**: Log fejl, raise HTTPException med status codes
+4. **Dependencies**: Deklarer i `module.json` hvis du bruger andre moduler
+5. **Migrations**: Nummer sekventielt (001, 002, 003...)
+6. **Documentation**: Opdater README.md med API endpoints og use cases
diff --git a/app/modules/_template/backend/__init__.py b/app/modules/_template/backend/__init__.py
new file mode 100644
index 0000000..2db4e36
--- /dev/null
+++ b/app/modules/_template/backend/__init__.py
@@ -0,0 +1 @@
+# Backend package for template module
diff --git a/app/modules/_template/backend/router.py b/app/modules/_template/backend/router.py
new file mode 100644
index 0000000..7623f19
--- /dev/null
+++ b/app/modules/_template/backend/router.py
@@ -0,0 +1,267 @@
+"""
+Template Module - API Router
+Backend endpoints for template module
+"""
+
+from fastapi import APIRouter, HTTPException
+from typing import List
+import logging
+
+from app.core.database import execute_query, execute_insert, execute_update
+from app.core.config import get_module_config
+
+logger = logging.getLogger(__name__)
+
+# APIRouter instance (module_loader kigger efter denne)
+router = APIRouter()
+
+
+@router.get("/template/items")
+async def get_items():
+ """
+ Hent alle items fra template module
+
+ Returns:
+ Liste af items
+ """
+ try:
+ # Check safety switch
+ read_only = get_module_config("template_module", "READ_ONLY", "true") == "true"
+
+ # Hent items (bemærk table_prefix)
+ items = execute_query(
+ "SELECT * FROM template_items ORDER BY created_at DESC"
+ )
+
+ return {
+ "success": True,
+ "items": items,
+ "read_only": read_only
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Error fetching items: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/template/items/{item_id}")
+async def get_item(item_id: int):
+ """
+ Hent enkelt item
+
+ Args:
+ item_id: Item ID
+
+ Returns:
+ Item object
+ """
+ try:
+ item = execute_query(
+ "SELECT * FROM template_items WHERE id = %s",
+ (item_id,),
+ fetchone=True
+ )
+
+ if not item:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ return {
+ "success": True,
+ "item": item
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error fetching item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/template/items")
+async def create_item(name: str, description: str = ""):
+ """
+ Opret nyt item
+
+ Args:
+ name: Item navn
+ description: Item beskrivelse
+
+ Returns:
+ Nyt item med ID
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("template_module", "READ_ONLY", "true") == "true"
+ dry_run = get_module_config("template_module", "DRY_RUN", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode",
+ "read_only": True
+ }
+
+ if dry_run:
+ logger.info(f"🧪 DRY_RUN: Would create item: {name}")
+ return {
+ "success": True,
+ "dry_run": True,
+ "message": f"DRY_RUN: Item '{name}' would be created"
+ }
+
+ # Opret item
+ item_id = execute_insert(
+ "INSERT INTO template_items (name, description) VALUES (%s, %s)",
+ (name, description)
+ )
+
+ logger.info(f"✅ Created item {item_id}: {name}")
+
+ return {
+ "success": True,
+ "item_id": item_id,
+ "name": name
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Error creating item: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.put("/template/items/{item_id}")
+async def update_item(item_id: int, name: str = None, description: str = None):
+ """
+ Opdater item
+
+ Args:
+ item_id: Item ID
+ name: Nyt navn (optional)
+ description: Ny beskrivelse (optional)
+
+ Returns:
+ Success status
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("template_module", "READ_ONLY", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode"
+ }
+
+ # Build update query dynamically
+ updates = []
+ params = []
+
+ if name is not None:
+ updates.append("name = %s")
+ params.append(name)
+
+ if description is not None:
+ updates.append("description = %s")
+ params.append(description)
+
+ if not updates:
+ raise HTTPException(status_code=400, detail="No fields to update")
+
+ params.append(item_id)
+
+ query = f"UPDATE template_items SET {', '.join(updates)} WHERE id = %s"
+ affected = execute_update(query, tuple(params))
+
+ if affected == 0:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ logger.info(f"✅ Updated item {item_id}")
+
+ return {
+ "success": True,
+ "item_id": item_id,
+ "affected": affected
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error updating item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.delete("/template/items/{item_id}")
+async def delete_item(item_id: int):
+ """
+ Slet item
+
+ Args:
+ item_id: Item ID
+
+ Returns:
+ Success status
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("template_module", "READ_ONLY", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode"
+ }
+
+ affected = execute_update(
+ "DELETE FROM template_items WHERE id = %s",
+ (item_id,)
+ )
+
+ if affected == 0:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ logger.info(f"✅ Deleted item {item_id}")
+
+ return {
+ "success": True,
+ "item_id": item_id
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error deleting item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/template/health")
+async def health_check():
+ """
+ Modul health check
+
+ Returns:
+ Health status
+ """
+ try:
+ # Test database connectivity
+ result = execute_query("SELECT 1 as test", fetchone=True)
+
+ return {
+ "status": "healthy",
+ "module": "template_module",
+ "version": "1.0.0",
+ "database": "connected" if result else "error",
+ "config": {
+ "read_only": get_module_config("template_module", "READ_ONLY", "true"),
+ "dry_run": get_module_config("template_module", "DRY_RUN", "true")
+ }
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Health check failed: {e}")
+ return {
+ "status": "unhealthy",
+ "module": "template_module",
+ "error": str(e)
+ }
diff --git a/app/modules/_template/frontend/__init__.py b/app/modules/_template/frontend/__init__.py
new file mode 100644
index 0000000..abc5ac0
--- /dev/null
+++ b/app/modules/_template/frontend/__init__.py
@@ -0,0 +1 @@
+# Frontend package for template module
diff --git a/app/modules/_template/frontend/views.py b/app/modules/_template/frontend/views.py
new file mode 100644
index 0000000..6e7e3f4
--- /dev/null
+++ b/app/modules/_template/frontend/views.py
@@ -0,0 +1,52 @@
+"""
+Template Module - Frontend Views
+HTML view routes for template module
+"""
+
+from fastapi import APIRouter, Request
+from fastapi.responses import HTMLResponse
+from fastapi.templating import Jinja2Templates
+import logging
+
+from app.core.database import execute_query
+
+logger = logging.getLogger(__name__)
+
+# APIRouter instance (module_loader kigger efter denne)
+router = APIRouter()
+
+# Templates til dette modul (relativ til module root)
+templates = Jinja2Templates(directory="app/modules/_template/templates")
+
+
+@router.get("/template", response_class=HTMLResponse)
+async def template_page(request: Request):
+ """
+ Template module hovedside
+
+ Args:
+ request: FastAPI request object
+
+ Returns:
+ HTML response
+ """
+ try:
+ # Hent items til visning
+ items = execute_query(
+ "SELECT * FROM template_items ORDER BY created_at DESC LIMIT 10"
+ )
+
+ return templates.TemplateResponse("index.html", {
+ "request": request,
+ "page_title": "Template Module",
+ "items": items or []
+ })
+
+ except Exception as e:
+ logger.error(f"❌ Error rendering template page: {e}")
+ return templates.TemplateResponse("index.html", {
+ "request": request,
+ "page_title": "Template Module",
+ "error": str(e),
+ "items": []
+ })
diff --git a/app/modules/_template/migrations/001_init.sql b/app/modules/_template/migrations/001_init.sql
new file mode 100644
index 0000000..d266086
--- /dev/null
+++ b/app/modules/_template/migrations/001_init.sql
@@ -0,0 +1,37 @@
+-- Template Module - Initial Migration
+-- Opret basis tabeller for template module
+
+-- Items tabel (eksempel)
+CREATE TABLE IF NOT EXISTS template_items (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(255) NOT NULL,
+ description TEXT,
+ active BOOLEAN DEFAULT TRUE,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Index for performance
+CREATE INDEX IF NOT EXISTS idx_template_items_active ON template_items(active);
+CREATE INDEX IF NOT EXISTS idx_template_items_created ON template_items(created_at DESC);
+
+-- Trigger for updated_at
+CREATE OR REPLACE FUNCTION update_template_items_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+ NEW.updated_at = CURRENT_TIMESTAMP;
+ RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_template_items_updated_at
+BEFORE UPDATE ON template_items
+FOR EACH ROW
+EXECUTE FUNCTION update_template_items_updated_at();
+
+-- Indsæt test data (optional)
+INSERT INTO template_items (name, description)
+VALUES
+ ('Test Item 1', 'This is a test item from template module'),
+ ('Test Item 2', 'Another test item')
+ON CONFLICT DO NOTHING;
diff --git a/app/modules/_template/module.json b/app/modules/_template/module.json
new file mode 100644
index 0000000..51de22a
--- /dev/null
+++ b/app/modules/_template/module.json
@@ -0,0 +1,17 @@
+{
+ "name": "template_module",
+ "version": "1.0.0",
+ "description": "Template for nye BMC Hub moduler",
+ "author": "BMC Networks",
+ "enabled": false,
+ "dependencies": [],
+ "table_prefix": "template_",
+ "api_prefix": "/api/v1/template",
+ "tags": ["Template"],
+ "config": {
+ "safety_switches": {
+ "read_only": true,
+ "dry_run": true
+ }
+ }
+}
diff --git a/app/modules/_template/templates/index.html b/app/modules/_template/templates/index.html
new file mode 100644
index 0000000..80ecb1b
--- /dev/null
+++ b/app/modules/_template/templates/index.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
{{ page_title }} - BMC Hub
+
+
+
+
+
{{ page_title }}
+
+ {% if error %}
+
+ Error: {{ error }}
+
+ {% endif %}
+
+
+
+
+ {% if items %}
+
+
+
+ | ID |
+ Name |
+ Description |
+ Created |
+
+
+
+ {% for item in items %}
+
+ | {{ item.id }} |
+ {{ item.name }} |
+ {{ item.description or '-' }} |
+ {{ item.created_at }} |
+
+ {% endfor %}
+
+
+ {% else %}
+
No items found. This is a template module.
+ {% endif %}
+
+
+
+
+
+
+
+
+
diff --git a/app/modules/test_module/README.md b/app/modules/test_module/README.md
new file mode 100644
index 0000000..19804d2
--- /dev/null
+++ b/app/modules/test_module/README.md
@@ -0,0 +1,137 @@
+# Test Module Module
+
+Dette er template strukturen for nye BMC Hub moduler.
+
+## Struktur
+
+```
+test_module/
+├── module.json # Metadata og konfiguration
+├── README.md # Dokumentation
+├── backend/
+│ ├── __init__.py
+│ └── router.py # FastAPI routes (API endpoints)
+├── frontend/
+│ ├── __init__.py
+│ └── views.py # HTML view routes
+├── templates/
+│ └── index.html # Jinja2 templates
+└── migrations/
+ └── 001_init.sql # Database migrations
+```
+
+## Opret nyt modul
+
+```bash
+python scripts/create_module.py test_module "My Module Description"
+```
+
+## Database Tables
+
+Alle tabeller SKAL bruge `table_prefix` fra module.json:
+
+```sql
+-- Hvis table_prefix = "test_module_"
+CREATE TABLE test_module_customers (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(255)
+);
+```
+
+Dette sikrer at moduler ikke kolliderer med core eller andre moduler.
+
+## Konfiguration
+
+Modul-specifikke miljøvariable følger mønsteret:
+
+```bash
+MODULES__MY_MODULE__API_KEY=secret123
+MODULES__MY_MODULE__READ_ONLY=true
+```
+
+Tilgå i kode:
+
+```python
+from app.core.config import get_module_config
+
+api_key = get_module_config("test_module", "API_KEY")
+read_only = get_module_config("test_module", "READ_ONLY", default="true") == "true"
+```
+
+## Database Queries
+
+Brug ALTID helper functions fra `app.core.database`:
+
+```python
+from app.core.database import execute_query, execute_insert
+
+# Fetch
+customers = execute_query(
+ "SELECT * FROM test_module_customers WHERE active = %s",
+ (True,)
+)
+
+# Insert
+customer_id = execute_insert(
+ "INSERT INTO test_module_customers (name) VALUES (%s)",
+ ("Test Customer",)
+)
+```
+
+## Migrations
+
+Migrations ligger i `migrations/` og køres manuelt eller via migration tool:
+
+```python
+from app.core.database import execute_module_migration
+
+with open("migrations/001_init.sql") as f:
+ migration_sql = f.read()
+
+success = execute_module_migration("test_module", migration_sql)
+```
+
+## Enable/Disable
+
+```bash
+# Enable via API
+curl -X POST http://localhost:8000/api/v1/modules/test_module/enable
+
+# Eller rediger module.json
+{
+ "enabled": true
+}
+
+# Restart app
+docker-compose restart api
+```
+
+## Fejlhåndtering
+
+Moduler er isolerede - hvis dit modul crasher ved opstart:
+- Core systemet kører videre
+- Modulet bliver ikke loaded
+- Fejl logges til console og logs/app.log
+
+Runtime fejl i endpoints påvirker ikke andre moduler.
+
+## Testing
+
+```python
+import pytest
+from app.core.database import execute_query
+
+def test_test_module():
+ # Test bruger samme database helpers
+ result = execute_query("SELECT 1 as test")
+ assert result[0]["test"] == 1
+```
+
+## Best Practices
+
+1. **Database isolering**: Brug ALTID `table_prefix` fra module.json
+2. **Safety switches**: Tilføj `READ_ONLY` og `DRY_RUN` flags
+3. **Error handling**: Log fejl, raise HTTPException med status codes
+4. **Dependencies**: Deklarer i `module.json` hvis du bruger andre moduler
+5. **Migrations**: Nummer sekventielt (001, 002, 003...)
+6. **Documentation**: Opdater README.md med API endpoints og use cases
diff --git a/app/modules/test_module/backend/__init__.py b/app/modules/test_module/backend/__init__.py
new file mode 100644
index 0000000..2db4e36
--- /dev/null
+++ b/app/modules/test_module/backend/__init__.py
@@ -0,0 +1 @@
+# Backend package for template module
diff --git a/app/modules/test_module/backend/router.py b/app/modules/test_module/backend/router.py
new file mode 100644
index 0000000..1e5f3e9
--- /dev/null
+++ b/app/modules/test_module/backend/router.py
@@ -0,0 +1,267 @@
+"""
+Test Module Module - API Router
+Backend endpoints for template module
+"""
+
+from fastapi import APIRouter, HTTPException
+from typing import List
+import logging
+
+from app.core.database import execute_query, execute_insert, execute_update
+from app.core.config import get_module_config
+
+logger = logging.getLogger(__name__)
+
+# APIRouter instance (module_loader kigger efter denne)
+router = APIRouter()
+
+
+@router.get("/test_module/items")
+async def get_items():
+ """
+ Hent alle items fra template module
+
+ Returns:
+ Liste af items
+ """
+ try:
+ # Check safety switch
+ read_only = get_module_config("test_module", "READ_ONLY", "true") == "true"
+
+ # Hent items (bemærk table_prefix)
+ items = execute_query(
+ "SELECT * FROM test_module_items ORDER BY created_at DESC"
+ )
+
+ return {
+ "success": True,
+ "items": items,
+ "read_only": read_only
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Error fetching items: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/test_module/items/{item_id}")
+async def get_item(item_id: int):
+ """
+ Hent enkelt item
+
+ Args:
+ item_id: Item ID
+
+ Returns:
+ Item object
+ """
+ try:
+ item = execute_query(
+ "SELECT * FROM test_module_items WHERE id = %s",
+ (item_id,),
+ fetchone=True
+ )
+
+ if not item:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ return {
+ "success": True,
+ "item": item
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error fetching item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/test_module/items")
+async def create_item(name: str, description: str = ""):
+ """
+ Opret nyt item
+
+ Args:
+ name: Item navn
+ description: Item beskrivelse
+
+ Returns:
+ Nyt item med ID
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("test_module", "READ_ONLY", "true") == "true"
+ dry_run = get_module_config("test_module", "DRY_RUN", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode",
+ "read_only": True
+ }
+
+ if dry_run:
+ logger.info(f"🧪 DRY_RUN: Would create item: {name}")
+ return {
+ "success": True,
+ "dry_run": True,
+ "message": f"DRY_RUN: Item '{name}' would be created"
+ }
+
+ # Opret item
+ item_id = execute_insert(
+ "INSERT INTO test_module_items (name, description) VALUES (%s, %s)",
+ (name, description)
+ )
+
+ logger.info(f"✅ Created item {item_id}: {name}")
+
+ return {
+ "success": True,
+ "item_id": item_id,
+ "name": name
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Error creating item: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.put("/test_module/items/{item_id}")
+async def update_item(item_id: int, name: str = None, description: str = None):
+ """
+ Opdater item
+
+ Args:
+ item_id: Item ID
+ name: Nyt navn (optional)
+ description: Ny beskrivelse (optional)
+
+ Returns:
+ Success status
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("test_module", "READ_ONLY", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode"
+ }
+
+ # Build update query dynamically
+ updates = []
+ params = []
+
+ if name is not None:
+ updates.append("name = %s")
+ params.append(name)
+
+ if description is not None:
+ updates.append("description = %s")
+ params.append(description)
+
+ if not updates:
+ raise HTTPException(status_code=400, detail="No fields to update")
+
+ params.append(item_id)
+
+ query = f"UPDATE test_module_items SET {', '.join(updates)} WHERE id = %s"
+ affected = execute_update(query, tuple(params))
+
+ if affected == 0:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ logger.info(f"✅ Updated item {item_id}")
+
+ return {
+ "success": True,
+ "item_id": item_id,
+ "affected": affected
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error updating item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.delete("/test_module/items/{item_id}")
+async def delete_item(item_id: int):
+ """
+ Slet item
+
+ Args:
+ item_id: Item ID
+
+ Returns:
+ Success status
+ """
+ try:
+ # Check safety switches
+ read_only = get_module_config("test_module", "READ_ONLY", "true") == "true"
+
+ if read_only:
+ logger.warning("⚠️ READ_ONLY mode enabled - operation blocked")
+ return {
+ "success": False,
+ "message": "Module is in READ_ONLY mode"
+ }
+
+ affected = execute_update(
+ "DELETE FROM test_module_items WHERE id = %s",
+ (item_id,)
+ )
+
+ if affected == 0:
+ raise HTTPException(status_code=404, detail="Item not found")
+
+ logger.info(f"✅ Deleted item {item_id}")
+
+ return {
+ "success": True,
+ "item_id": item_id
+ }
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ logger.error(f"❌ Error deleting item {item_id}: {e}")
+ raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/test_module/health")
+async def health_check():
+ """
+ Modul health check
+
+ Returns:
+ Health status
+ """
+ try:
+ # Test database connectivity
+ result = execute_query("SELECT 1 as test", fetchone=True)
+
+ return {
+ "status": "healthy",
+ "module": "test_module",
+ "version": "1.0.0",
+ "database": "connected" if result else "error",
+ "config": {
+ "read_only": get_module_config("test_module", "READ_ONLY", "true"),
+ "dry_run": get_module_config("test_module", "DRY_RUN", "true")
+ }
+ }
+
+ except Exception as e:
+ logger.error(f"❌ Health check failed: {e}")
+ return {
+ "status": "unhealthy",
+ "module": "test_module",
+ "error": str(e)
+ }
diff --git a/app/modules/test_module/frontend/__init__.py b/app/modules/test_module/frontend/__init__.py
new file mode 100644
index 0000000..abc5ac0
--- /dev/null
+++ b/app/modules/test_module/frontend/__init__.py
@@ -0,0 +1 @@
+# Frontend package for template module
diff --git a/app/modules/test_module/frontend/views.py b/app/modules/test_module/frontend/views.py
new file mode 100644
index 0000000..2e46d5d
--- /dev/null
+++ b/app/modules/test_module/frontend/views.py
@@ -0,0 +1,52 @@
+"""
+Test Module Module - Frontend Views
+HTML view routes for template module
+"""
+
+from fastapi import APIRouter, Request
+from fastapi.responses import HTMLResponse
+from fastapi.templating import Jinja2Templates
+import logging
+
+from app.core.database import execute_query
+
+logger = logging.getLogger(__name__)
+
+# APIRouter instance (module_loader kigger efter denne)
+router = APIRouter()
+
+# Templates til dette modul (relativ til module root)
+templates = Jinja2Templates(directory="app/modules/test_module/test_modules")
+
+
+@router.get("/test_module", response_class=HTMLResponse)
+async def template_page(request: Request):
+ """
+ Template module hovedside
+
+ Args:
+ request: FastAPI request object
+
+ Returns:
+ HTML response
+ """
+ try:
+ # Hent items til visning
+ items = execute_query(
+ "SELECT * FROM test_module_items ORDER BY created_at DESC LIMIT 10"
+ )
+
+ return templates.TemplateResponse("index.html", {
+ "request": request,
+ "page_title": "Test Module Module",
+ "items": items or []
+ })
+
+ except Exception as e:
+ logger.error(f"❌ Error rendering template page: {e}")
+ return templates.TemplateResponse("index.html", {
+ "request": request,
+ "page_title": "Test Module Module",
+ "error": str(e),
+ "items": []
+ })
diff --git a/app/modules/test_module/migrations/001_init.sql b/app/modules/test_module/migrations/001_init.sql
new file mode 100644
index 0000000..94567a0
--- /dev/null
+++ b/app/modules/test_module/migrations/001_init.sql
@@ -0,0 +1,37 @@
+-- Test Module Module - Initial Migration
+-- Opret basis tabeller for template module
+
+-- Items tabel (eksempel)
+CREATE TABLE IF NOT EXISTS test_module_items (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(255) NOT NULL,
+ description TEXT,
+ active BOOLEAN DEFAULT TRUE,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Index for performance
+CREATE INDEX IF NOT EXISTS idx_test_module_items_active ON test_module_items(active);
+CREATE INDEX IF NOT EXISTS idx_test_module_items_created ON test_module_items(created_at DESC);
+
+-- Trigger for updated_at
+CREATE OR REPLACE FUNCTION update_test_module_items_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+ NEW.updated_at = CURRENT_TIMESTAMP;
+ RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trigger_test_module_items_updated_at
+BEFORE UPDATE ON test_module_items
+FOR EACH ROW
+EXECUTE FUNCTION update_test_module_items_updated_at();
+
+-- Indsæt test data (optional)
+INSERT INTO test_module_items (name, description)
+VALUES
+ ('Test Item 1', 'This is a test item from template module'),
+ ('Test Item 2', 'Another test item')
+ON CONFLICT DO NOTHING;
diff --git a/app/modules/test_module/module.json b/app/modules/test_module/module.json
new file mode 100644
index 0000000..7189366
--- /dev/null
+++ b/app/modules/test_module/module.json
@@ -0,0 +1,19 @@
+{
+ "name": "test_module",
+ "version": "1.0.0",
+ "description": "Test modul for demo",
+ "author": "BMC Networks",
+ "enabled": false,
+ "dependencies": [],
+ "table_prefix": "test_module_",
+ "api_prefix": "/api/v1/test_module",
+ "tags": [
+ "Test Module"
+ ],
+ "config": {
+ "safety_switches": {
+ "read_only": true,
+ "dry_run": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/modules/test_module/templates/index.html b/app/modules/test_module/templates/index.html
new file mode 100644
index 0000000..80ecb1b
--- /dev/null
+++ b/app/modules/test_module/templates/index.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
{{ page_title }} - BMC Hub
+
+
+
+
+
{{ page_title }}
+
+ {% if error %}
+
+ Error: {{ error }}
+
+ {% endif %}
+
+
+
+
+ {% if items %}
+
+
+
+ | ID |
+ Name |
+ Description |
+ Created |
+
+
+
+ {% for item in items %}
+
+ | {{ item.id }} |
+ {{ item.name }} |
+ {{ item.description or '-' }} |
+ {{ item.created_at }} |
+
+ {% endfor %}
+
+
+ {% else %}
+
No items found. This is a template module.
+ {% endif %}
+
+
+
+
+
+
+
+
+
diff --git a/app/services/simplycrm_service.py b/app/services/simplycrm_service.py
new file mode 100644
index 0000000..cd44634
--- /dev/null
+++ b/app/services/simplycrm_service.py
@@ -0,0 +1,522 @@
+"""
+Simply-CRM Integration Service
+Sync abonnementer, fakturaer og kunder fra Simply-CRM (VTiger fork)
+
+Simply-CRM bruger webservice.php endpoint med challenge-token authentication:
+- Endpoint: /webservice.php
+- Auth: getchallenge + login med MD5 hash
+- Moduler: Accounts, Invoice, Products, SalesOrder
+"""
+import logging
+import json
+import hashlib
+import aiohttp
+from typing import List, Dict, Optional, Any
+from datetime import datetime, date
+from app.core.config import settings
+
+logger = logging.getLogger(__name__)
+
+
+class SimplyCRMService:
+ """Service for integrating with Simply-CRM via webservice.php (VTiger fork)"""
+
+ def __init__(self):
+ # Simply-CRM bruger OLD_VTIGER settings
+ self.base_url = getattr(settings, 'OLD_VTIGER_URL', None)
+ self.username = getattr(settings, 'OLD_VTIGER_USERNAME', None)
+ self.access_key = getattr(settings, 'OLD_VTIGER_ACCESS_KEY', None)
+
+ self.session_name: Optional[str] = None
+ self.session: Optional[aiohttp.ClientSession] = None
+
+ if not all([self.base_url, self.username, self.access_key]):
+ logger.warning("⚠️ Simply-CRM credentials not configured (OLD_VTIGER_* settings)")
+
+ async def __aenter__(self):
+ """Context manager entry - create session and login"""
+ self.session = aiohttp.ClientSession()
+ await self.login()
+ return self
+
+ async def __aexit__(self, exc_type, exc_val, exc_tb):
+ """Context manager exit - close session"""
+ if self.session:
+ await self.session.close()
+ self.session = None
+ self.session_name = None
+
+ async def login(self) -> bool:
+ """
+ Login to Simply-CRM using challenge-token authentication
+
+ Returns:
+ True if login successful
+ """
+ if not self.base_url or not self.username or not self.access_key:
+ logger.error("❌ Simply-CRM credentials not configured")
+ return False
+
+ try:
+ if not self.session:
+ self.session = aiohttp.ClientSession()
+
+ # Step 1: Get challenge token
+ async with self.session.get(
+ f"{self.base_url}/webservice.php",
+ params={"operation": "getchallenge", "username": self.username},
+ timeout=aiohttp.ClientTimeout(total=30)
+ ) as response:
+ if not response.ok:
+ logger.error(f"❌ Simply-CRM challenge request failed: {response.status}")
+ return False
+
+ data = await response.json()
+ if not data.get("success"):
+ logger.error(f"❌ Simply-CRM challenge failed: {data}")
+ return False
+
+ token = data["result"]["token"]
+
+ # Step 2: Generate access key hash
+ access_key_hash = hashlib.md5(f"{token}{self.access_key}".encode()).hexdigest()
+
+ # Step 3: Login
+ async with self.session.post(
+ f"{self.base_url}/webservice.php",
+ data={
+ "operation": "login",
+ "username": self.username,
+ "accessKey": access_key_hash
+ },
+ timeout=aiohttp.ClientTimeout(total=30)
+ ) as response:
+ if not response.ok:
+ logger.error(f"❌ Simply-CRM login request failed: {response.status}")
+ return False
+
+ data = await response.json()
+ if not data.get("success"):
+ logger.error(f"❌ Simply-CRM login failed: {data}")
+ return False
+
+ self.session_name = data["result"]["sessionName"]
+ session_preview = self.session_name[:20] if self.session_name else "unknown"
+ logger.info(f"✅ Simply-CRM login successful (session: {session_preview}...)")
+ return True
+
+ except aiohttp.ClientError as e:
+ logger.error(f"❌ Simply-CRM connection error: {e}")
+ return False
+ except Exception as e:
+ logger.error(f"❌ Simply-CRM login error: {e}")
+ return False
+
+ async def test_connection(self) -> bool:
+ """
+ Test Simply-CRM connection by logging in
+
+ Returns:
+ True if connection successful
+ """
+ try:
+ async with aiohttp.ClientSession() as session:
+ self.session = session
+ result = await self.login()
+ self.session = None
+ return result
+ except Exception as e:
+ logger.error(f"❌ Simply-CRM connection test failed: {e}")
+ return False
+
+ async def _ensure_session(self):
+ """Ensure we have an active session"""
+ if not self.session:
+ self.session = aiohttp.ClientSession()
+ if not self.session_name:
+ await self.login()
+
+ async def query(self, query_string: str) -> List[Dict]:
+ """
+ Execute a query on Simply-CRM
+
+ Args:
+ query_string: SQL-like query (e.g., "SELECT * FROM Accounts LIMIT 100;")
+
+ Returns:
+ List of records
+ """
+ await self._ensure_session()
+
+ if not self.session_name or not self.session:
+ logger.error("❌ Not logged in to Simply-CRM")
+ return []
+
+ try:
+ async with self.session.get(
+ f"{self.base_url}/webservice.php",
+ params={
+ "operation": "query",
+ "sessionName": self.session_name,
+ "query": query_string
+ },
+ timeout=aiohttp.ClientTimeout(total=60)
+ ) as response:
+ if not response.ok:
+ logger.error(f"❌ Simply-CRM query failed: {response.status}")
+ return []
+
+ data = await response.json()
+ if not data.get("success"):
+ error = data.get("error", {})
+ logger.error(f"❌ Simply-CRM query error: {error}")
+ return []
+
+ result = data.get("result", [])
+ logger.debug(f"✅ Simply-CRM query returned {len(result)} records")
+ return result
+
+ except Exception as e:
+ logger.error(f"❌ Simply-CRM query error: {e}")
+ return []
+
+ async def retrieve(self, record_id: str) -> Optional[Dict]:
+ """
+ Retrieve a specific record by ID
+
+ Args:
+ record_id: VTiger-style ID (e.g., "6x12345")
+
+ Returns:
+ Record dict or None
+ """
+ await self._ensure_session()
+
+ if not self.session_name or not self.session:
+ return None
+
+ try:
+ async with self.session.get(
+ f"{self.base_url}/webservice.php",
+ params={
+ "operation": "retrieve",
+ "sessionName": self.session_name,
+ "id": record_id
+ },
+ timeout=aiohttp.ClientTimeout(total=30)
+ ) as response:
+ if not response.ok:
+ return None
+
+ data = await response.json()
+ if data.get("success"):
+ return data.get("result")
+ return None
+ except Exception as e:
+ logger.error(f"❌ Simply-CRM retrieve error: {e}")
+ return None
+
+ # =========================================================================
+ # SUBSCRIPTIONS
+ # =========================================================================
+
+ async def fetch_subscriptions(self, limit: int = 100, offset: int = 0) -> List[Dict]:
+ """
+ Fetch subscriptions from Simply-CRM via recurring SalesOrders
+
+ SalesOrders with enable_recurring='1' are the subscription source in Simply-CRM.
+ """
+ query = f"SELECT * FROM SalesOrder WHERE enable_recurring = '1' LIMIT {offset}, {limit};"
+ return await self.query(query)
+
+ async def fetch_active_subscriptions(self) -> List[Dict]:
+ """
+ Fetch all active recurring SalesOrders (subscriptions)
+
+ Returns deduplicated list of unique SalesOrders.
+ """
+ all_records = []
+ offset = 0
+ limit = 100
+ seen_ids = set()
+
+ while True:
+ query = f"SELECT * FROM SalesOrder WHERE enable_recurring = '1' LIMIT {offset}, {limit};"
+ batch = await self.query(query)
+
+ if not batch:
+ break
+
+ # Deduplicate by id (VTiger returns one row per line item)
+ for record in batch:
+ record_id = record.get('id')
+ if record_id and record_id not in seen_ids:
+ seen_ids.add(record_id)
+ all_records.append(record)
+
+ if len(batch) < limit:
+ break
+
+ offset += limit
+
+ logger.info(f"📊 Fetched {len(all_records)} unique recurring SalesOrders from Simply-CRM")
+ return all_records
+
+ # =========================================================================
+ # INVOICES
+ # =========================================================================
+
+ async def fetch_invoices(self, limit: int = 100, offset: int = 0) -> List[Dict]:
+ """Fetch invoices from Simply-CRM"""
+ query = f"SELECT * FROM Invoice LIMIT {offset}, {limit};"
+ return await self.query(query)
+
+ async def fetch_invoices_by_account(self, account_id: str) -> List[Dict]:
+ """Fetch all invoices for a specific account"""
+ query = f"SELECT * FROM Invoice WHERE account_id = '{account_id}';"
+ return await self.query(query)
+
+ async def fetch_invoice_with_lines(self, invoice_id: str) -> Optional[Dict]:
+ """Fetch invoice with full line item details"""
+ return await self.retrieve(invoice_id)
+
+ async def fetch_recent_invoices(self, days: int = 30) -> List[Dict]:
+ """Fetch invoices from the last N days"""
+ from datetime import datetime, timedelta
+ since_date = (datetime.now() - timedelta(days=days)).strftime('%Y-%m-%d')
+
+ all_invoices = []
+ offset = 0
+ limit = 100
+
+ while True:
+ query = f"SELECT * FROM Invoice WHERE invoicedate >= '{since_date}' LIMIT {offset}, {limit};"
+ batch = await self.query(query)
+
+ if not batch:
+ break
+
+ all_invoices.extend(batch)
+
+ if len(batch) < limit:
+ break
+
+ offset += limit
+
+ logger.info(f"📊 Fetched {len(all_invoices)} invoices from last {days} days")
+ return all_invoices
+
+ # =========================================================================
+ # ACCOUNTS (CUSTOMERS)
+ # =========================================================================
+
+ async def fetch_accounts(self, limit: int = 100, offset: int = 0) -> List[Dict]:
+ """Fetch accounts (customers) from Simply-CRM"""
+ query = f"SELECT * FROM Accounts LIMIT {offset}, {limit};"
+ return await self.query(query)
+
+ async def fetch_account_by_id(self, account_id: str) -> Optional[Dict]:
+ """Fetch account by VTiger ID (e.g., '11x12345')"""
+ return await self.retrieve(account_id)
+
+ async def fetch_account_by_name(self, name: str) -> Optional[Dict]:
+ """Find account by name"""
+ query = f"SELECT * FROM Accounts WHERE accountname = '{name}';"
+ results = await self.query(query)
+ return results[0] if results else None
+
+ async def fetch_account_by_cvr(self, cvr: str) -> Optional[Dict]:
+ """Find account by CVR number"""
+ query = f"SELECT * FROM Accounts WHERE siccode = '{cvr}';"
+ results = await self.query(query)
+
+ if not results:
+ # Try vat_number field
+ query = f"SELECT * FROM Accounts WHERE vat_number = '{cvr}';"
+ results = await self.query(query)
+
+ return results[0] if results else None
+
+ async def fetch_all_accounts(self) -> List[Dict]:
+ """Fetch all accounts (with pagination)"""
+ all_accounts = []
+ offset = 0
+ limit = 100
+
+ while True:
+ batch = await self.fetch_accounts(limit, offset)
+
+ if not batch:
+ break
+
+ all_accounts.extend(batch)
+
+ if len(batch) < limit:
+ break
+
+ offset += limit
+
+ logger.info(f"📊 Fetched {len(all_accounts)} accounts from Simply-CRM")
+ return all_accounts
+
+ # =========================================================================
+ # PRODUCTS
+ # =========================================================================
+
+ async def fetch_products(self, limit: int = 100, offset: int = 0) -> List[Dict]:
+ """Fetch products from Simply-CRM"""
+ query = f"SELECT * FROM Products LIMIT {offset}, {limit};"
+ return await self.query(query)
+
+ async def fetch_product_by_number(self, product_number: str) -> Optional[Dict]:
+ """Find product by product number"""
+ query = f"SELECT * FROM Products WHERE product_no = '{product_number}';"
+ results = await self.query(query)
+ return results[0] if results else None
+
+ # =========================================================================
+ # SYNC HELPERS
+ # =========================================================================
+
+ async def get_modified_since(self, module: str, since_date: str) -> List[Dict]:
+ """Get records modified since a specific date"""
+ all_records = []
+ offset = 0
+ limit = 100
+
+ while True:
+ query = f"SELECT * FROM {module} WHERE modifiedtime >= '{since_date}' LIMIT {offset}, {limit};"
+ batch = await self.query(query)
+
+ if not batch:
+ break
+
+ all_records.extend(batch)
+
+ if len(batch) < limit:
+ break
+
+ offset += limit
+
+ return all_records
+
+ def extract_subscription_data(self, raw_salesorder: Dict) -> Dict:
+ """
+ Extract and normalize subscription data from Simply-CRM SalesOrder format
+
+ SalesOrders with enable_recurring='1' are the subscription source.
+ Key fields:
+ - recurring_frequency: Monthly, Quarterly, Yearly
+ - start_period / end_period: Subscription period
+ - cf_abonnementsperiode_dato: Binding end date
+ - arr: Annual Recurring Revenue
+ - sostatus: Created, Approved, Lukket
+ """
+ return {
+ 'simplycrm_id': raw_salesorder.get('id'),
+ 'salesorder_no': raw_salesorder.get('salesorder_no'),
+ 'name': raw_salesorder.get('subject', ''),
+ 'account_id': raw_salesorder.get('account_id'),
+ 'status': self._map_salesorder_status(raw_salesorder.get('sostatus')),
+ 'start_date': raw_salesorder.get('start_period'),
+ 'end_date': raw_salesorder.get('end_period'),
+ 'binding_end_date': raw_salesorder.get('cf_abonnementsperiode_dato'),
+ 'billing_frequency': self._map_billing_frequency(raw_salesorder.get('recurring_frequency')),
+ 'auto_invoicing': raw_salesorder.get('auto_invoicing'),
+ 'last_recurring_date': raw_salesorder.get('last_recurring_date'),
+ 'total_amount': self._parse_amount(raw_salesorder.get('hdnGrandTotal')),
+ 'subtotal': self._parse_amount(raw_salesorder.get('hdnSubTotal')),
+ 'arr': self._parse_amount(raw_salesorder.get('arr')),
+ 'currency': 'DKK',
+ 'modified_time': raw_salesorder.get('modifiedtime'),
+ 'created_time': raw_salesorder.get('createdtime'),
+ 'eco_order_number': raw_salesorder.get('eco_order_number'),
+ }
+
+ def _map_salesorder_status(self, status: Optional[str]) -> str:
+ """Map Simply-CRM SalesOrder status to OmniSync status"""
+ if not status:
+ return 'active'
+ status_map = {
+ 'Created': 'active',
+ 'Approved': 'active',
+ 'Delivered': 'active',
+ 'Lukket': 'cancelled',
+ 'Cancelled': 'cancelled',
+ }
+ return status_map.get(status, 'active')
+
+ def extract_invoice_data(self, raw_invoice: Dict) -> Dict:
+ """Extract and normalize invoice data from Simply-CRM format"""
+ return {
+ 'simplycrm_id': raw_invoice.get('id'),
+ 'invoice_number': raw_invoice.get('invoice_no'),
+ 'invoice_date': raw_invoice.get('invoicedate'),
+ 'account_id': raw_invoice.get('account_id'),
+ 'status': self._map_invoice_status(raw_invoice.get('invoicestatus')),
+ 'subtotal': self._parse_amount(raw_invoice.get('hdnSubTotal')),
+ 'tax_amount': self._parse_amount(raw_invoice.get('hdnTax')),
+ 'total_amount': self._parse_amount(raw_invoice.get('hdnGrandTotal')),
+ 'currency': raw_invoice.get('currency_id', 'DKK'),
+ 'line_items': raw_invoice.get('LineItems', []),
+ 'subscription_period': raw_invoice.get('cf_subscription_period'),
+ 'is_subscription': raw_invoice.get('invoicestatus') == 'Auto Created',
+ 'modified_time': raw_invoice.get('modifiedtime'),
+ }
+
+ def _map_subscription_status(self, status: Optional[str]) -> str:
+ """Map Simply-CRM subscription status to OmniSync status"""
+ if not status:
+ return 'active'
+ status_map = {
+ 'Active': 'active',
+ 'Cancelled': 'cancelled',
+ 'Expired': 'expired',
+ 'Suspended': 'suspended',
+ 'Pending': 'draft',
+ }
+ return status_map.get(status, 'active')
+
+ def _map_invoice_status(self, status: Optional[str]) -> str:
+ """Map Simply-CRM invoice status"""
+ if not status:
+ return 'active'
+ status_map = {
+ 'Created': 'active',
+ 'Approved': 'active',
+ 'Sent': 'active',
+ 'Paid': 'paid',
+ 'Cancelled': 'cancelled',
+ 'Credit Invoice': 'credited',
+ 'Auto Created': 'active',
+ }
+ return status_map.get(status, 'active')
+
+ def _map_billing_frequency(self, frequency: Optional[str]) -> str:
+ """Map billing frequency to standard format"""
+ if not frequency:
+ return 'monthly'
+ freq_map = {
+ 'Monthly': 'monthly',
+ 'Quarterly': 'quarterly',
+ 'Semi-annually': 'semi_annual',
+ 'Annually': 'yearly',
+ 'Yearly': 'yearly',
+ }
+ return freq_map.get(frequency, 'monthly')
+
+ def _parse_amount(self, value: Any) -> float:
+ """Parse amount from string or number"""
+ if value is None:
+ return 0.0
+ if isinstance(value, (int, float)):
+ return float(value)
+ try:
+ cleaned = str(value).replace(' ', '').replace(',', '.').replace('DKK', '').replace('kr', '')
+ return float(cleaned)
+ except (ValueError, TypeError):
+ return 0.0
+
+
+# Singleton instance
+simplycrm_service = SimplyCRMService()
diff --git a/app/services/vtiger_service.py b/app/services/vtiger_service.py
index b149cc3..2dd94aa 100644
--- a/app/services/vtiger_service.py
+++ b/app/services/vtiger_service.py
@@ -3,6 +3,7 @@ vTiger Cloud CRM Integration Service
Handles subscription and sales order data retrieval
"""
import logging
+import json
import aiohttp
from typing import List, Dict, Optional
from app.core.config import settings
@@ -137,6 +138,75 @@ class VTigerService:
logger.error(f"❌ Error fetching subscriptions: {e}")
return []
+ async def get_subscription(self, subscription_id: str) -> Optional[Dict]:
+ """
+ Fetch full subscription details with LineItems from vTiger
+
+ Args:
+ subscription_id: vTiger subscription ID (e.g., "72x123")
+
+ Returns:
+ Subscription record with LineItems array or None
+ """
+ if not self.rest_endpoint:
+ raise ValueError("VTIGER_URL not configured")
+
+ try:
+ auth = self._get_auth()
+
+ async with aiohttp.ClientSession() as session:
+ url = f"{self.rest_endpoint}/retrieve?id={subscription_id}"
+
+ async with session.get(url, auth=auth) as response:
+ if response.status == 200:
+ text = await response.text()
+ data = json.loads(text)
+ if data.get('success'):
+ logger.info(f"✅ Retrieved subscription {subscription_id}")
+ return data.get('result')
+ else:
+ logger.error(f"❌ vTiger API error: {data.get('error')}")
+ return None
+ else:
+ logger.error(f"❌ HTTP {response.status} retrieving subscription")
+ return None
+
+ except Exception as e:
+ logger.error(f"❌ Error retrieving subscription: {e}")
+ return None
+
+ async def get_account(self, vtiger_account_id: str) -> Optional[Dict]:
+ """
+ Fetch account details from vTiger
+
+ Args:
+ vtiger_account_id: vTiger account ID (e.g., "3x760")
+
+ Returns:
+ Account record with BMC Låst field (cf_accounts_bmclst) or None
+ """
+ if not vtiger_account_id:
+ logger.warning("⚠️ No vTiger account ID provided")
+ return None
+
+ try:
+ # Query for account by ID
+ query = f"SELECT * FROM Accounts WHERE id='{vtiger_account_id}';"
+
+ logger.info(f"🔍 Fetching account details for {vtiger_account_id}")
+ accounts = await self.query(query)
+
+ if accounts:
+ logger.info(f"✅ Found account: {accounts[0].get('accountname', 'Unknown')}")
+ return accounts[0]
+ else:
+ logger.warning(f"⚠️ No account found with ID {vtiger_account_id}")
+ return None
+
+ except Exception as e:
+ logger.error(f"❌ Error fetching account: {e}")
+ return None
+
async def test_connection(self) -> bool:
"""
Test vTiger connection using /me endpoint
@@ -177,6 +247,151 @@ class VTigerService:
except Exception as e:
logger.error(f"❌ vTiger connection error: {e}")
return False
+
+ async def create_subscription(
+ self,
+ account_id: str,
+ subject: str,
+ startdate: str,
+ generateinvoiceevery: str,
+ subscriptionstatus: str = "Active",
+ enddate: Optional[str] = None,
+ products: Optional[List[Dict]] = None
+ ) -> Dict:
+ """
+ Create a new subscription in vTiger
+
+ Args:
+ account_id: vTiger account ID (e.g., "3x123")
+ subject: Subscription subject/name
+ startdate: Start date (YYYY-MM-DD)
+ generateinvoiceevery: Frequency ("Monthly", "Quarterly", "Yearly")
+ subscriptionstatus: Status ("Active", "Cancelled", "Stopped")
+ enddate: End date (YYYY-MM-DD), optional
+ products: List of products [{"productid": "id", "quantity": 1, "listprice": 100}]
+ """
+ if not self.rest_endpoint:
+ raise ValueError("VTIGER_URL not configured")
+
+ try:
+ auth = self._get_auth()
+
+ # Build subscription data
+ subscription_data = {
+ "account_id": account_id,
+ "subject": subject,
+ "startdate": startdate,
+ "generateinvoiceevery": generateinvoiceevery,
+ "subscriptionstatus": subscriptionstatus,
+ }
+
+ if enddate:
+ subscription_data["enddate"] = enddate
+
+ # Add products if provided
+ if products:
+ subscription_data["products"] = products
+
+ async with aiohttp.ClientSession() as session:
+ create_url = f"{self.rest_endpoint}/create"
+
+ payload = {
+ "elementType": "Subscription",
+ "element": subscription_data
+ }
+
+ logger.info(f"📤 Creating subscription: {subject}")
+
+ async with session.post(create_url, json=payload, auth=auth) as response:
+ if response.status == 200:
+ data = await response.json()
+ if data.get("success"):
+ result = data.get("result", {})
+ logger.info(f"✅ Created subscription: {result.get('id')}")
+ return result
+ else:
+ error_msg = data.get("error", {}).get("message", "Unknown error")
+ raise Exception(f"vTiger API error: {error_msg}")
+ else:
+ error_text = await response.text()
+ raise Exception(f"HTTP {response.status}: {error_text}")
+
+ except Exception as e:
+ logger.error(f"❌ Error creating subscription: {e}")
+ raise
+
+ async def update_subscription(self, subscription_id: str, updates: Dict, line_items: List[Dict] = None) -> Dict:
+ """
+ Update a subscription in vTiger with optional line item price updates
+
+ Args:
+ subscription_id: vTiger subscription ID (e.g., "72x123")
+ updates: Dictionary of fields to update (subject, startdate, etc.)
+ line_items: Optional list of line items with updated prices
+ Each item: {"productid": "6x123", "quantity": "3", "listprice": "299.00"}
+ """
+ if not self.rest_endpoint:
+ raise ValueError("VTIGER_URL not configured")
+
+ try:
+ auth = self._get_auth()
+
+ async with aiohttp.ClientSession() as session:
+ # For custom fields (cf_*), we need to retrieve first for context
+ if any(k.startswith('cf_') for k in updates.keys()):
+ logger.info(f"📥 Retrieving subscription {subscription_id} for custom field update")
+ current_sub = await self.get_subscription(subscription_id)
+ if current_sub:
+ # Only include essential fields + custom field update
+ essential_fields = ['id', 'account_id', 'subject', 'startdate',
+ 'generateinvoiceevery', 'subscriptionstatus']
+ element_data = {
+ k: current_sub[k]
+ for k in essential_fields
+ if k in current_sub
+ }
+ element_data.update(updates)
+ element_data['id'] = subscription_id
+ else:
+ element_data = {"id": subscription_id, **updates}
+ else:
+ element_data = {"id": subscription_id, **updates}
+
+ update_url = f"{self.rest_endpoint}/update"
+
+ # Add LineItems if provided
+ if line_items:
+ element_data["LineItems"] = line_items
+ logger.info(f"📝 Updating {len(line_items)} line items")
+
+ payload = {
+ "elementType": "Subscription",
+ "element": element_data
+ }
+
+ logger.info(f"📤 Updating subscription {subscription_id}: {list(updates.keys())}")
+ logger.debug(f"Payload: {json.dumps(payload, indent=2)}")
+
+ async with session.post(update_url, json=payload, auth=auth) as response:
+ if response.status == 200:
+ text = await response.text()
+ data = json.loads(text)
+ if data.get("success"):
+ result = data.get("result", {})
+ logger.info(f"✅ Updated subscription: {subscription_id}")
+ return result
+ else:
+ error_msg = data.get("error", {}).get("message", "Unknown error")
+ logger.error(f"❌ vTiger error response: {data.get('error')}")
+ raise Exception(f"vTiger API error: {error_msg}")
+ else:
+ error_text = await response.text()
+ logger.error(f"❌ vTiger HTTP error: {error_text[:500]}")
+ raise Exception(f"HTTP {response.status}: {error_text}")
+
+ except Exception as e:
+ logger.error(f"❌ Error updating subscription: {e}")
+ raise
# Singleton instance
diff --git a/app/settings/frontend/settings.html b/app/settings/frontend/settings.html
index f49799e..9552ef0 100644
--- a/app/settings/frontend/settings.html
+++ b/app/settings/frontend/settings.html
@@ -92,6 +92,9 @@
AI Prompts
+
+ Moduler
+
System
@@ -197,6 +200,226 @@