diff --git a/.env.example b/.env.example index 2d7b0c2..d8025d1 100644 --- a/.env.example +++ b/.env.example @@ -70,6 +70,19 @@ ECONOMIC_AGREEMENT_GRANT_TOKEN=your_agreement_grant_token_here ECONOMIC_READ_ONLY=true # Set to false ONLY after testing ECONOMIC_DRY_RUN=true # Set to false ONLY when ready for production writes +# ===================================================== +# ALSO Cloud Marketplace Integration (Optional) +# ===================================================== +ALSO_ENABLED=false +ALSO_API_BASE_URL= +ALSO_API_KEY= +ALSO_API_SECRET= +ALSO_TIMEOUT_SECONDS=20 + +# 🚨 SAFETY SWITCHES - Beskytter mod utilsigtede importer/sync +ALSO_READ_ONLY=true +ALSO_DRY_RUN=true + # ===================================================== # FedEx Integration (Optional) # ===================================================== diff --git a/.env.prod.example b/.env.prod.example index 0ee8ddf..cf3454e 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -87,6 +87,20 @@ ECONOMIC_AGREEMENT_GRANT_TOKEN=your_production_grant_here ECONOMIC_READ_ONLY=true ECONOMIC_DRY_RUN=true +# ===================================================== +# ALSO Cloud Marketplace Integration - Production (Optional) +# ===================================================== +ALSO_ENABLED=false +ALSO_API_BASE_URL= +ALSO_API_KEY= +ALSO_API_SECRET= +ALSO_TIMEOUT_SECONDS=20 + +# 🚨 SAFETY SWITCHES +# Start ALTID med begge sat til true i ny production deployment! +ALSO_READ_ONLY=true +ALSO_DRY_RUN=true + # ===================================================== # FedEx Integration - Production # ===================================================== diff --git a/# GitHub Copilot Instructions - BMC Webs.prompt.md b/MDfile/# GitHub Copilot Instructions - BMC Webs.prompt.md similarity index 100% rename from # GitHub Copilot Instructions - BMC Webs.prompt.md rename to MDfile/# GitHub Copilot Instructions - BMC Webs.prompt.md diff --git a/BACKUP_RESTORE_TEST_PLAN.md b/MDfile/BACKUP_RESTORE_TEST_PLAN.md similarity index 100% rename from BACKUP_RESTORE_TEST_PLAN.md rename to MDfile/BACKUP_RESTORE_TEST_PLAN.md diff --git a/DEPLOYMENT_CHECKLIST.md b/MDfile/DEPLOYMENT_CHECKLIST.md similarity index 100% rename from DEPLOYMENT_CHECKLIST.md rename to MDfile/DEPLOYMENT_CHECKLIST.md diff --git a/DEVELOPMENT.md b/MDfile/DEVELOPMENT.md similarity index 100% rename from DEVELOPMENT.md rename to MDfile/DEVELOPMENT.md diff --git a/LOCATION_MODULE_IMPLEMENTATION_COMPLETE.md b/MDfile/LOCATION_MODULE_IMPLEMENTATION_COMPLETE.md similarity index 100% rename from LOCATION_MODULE_IMPLEMENTATION_COMPLETE.md rename to MDfile/LOCATION_MODULE_IMPLEMENTATION_COMPLETE.md diff --git a/MIGRATION_GUIDE_v2.0.0.md b/MDfile/MIGRATION_GUIDE_v2.0.0.md similarity index 100% rename from MIGRATION_GUIDE_v2.0.0.md rename to MDfile/MIGRATION_GUIDE_v2.0.0.md diff --git a/NEXTCLOUD_MODULE_PLAN.md b/MDfile/NEXTCLOUD_MODULE_PLAN.md similarity index 100% rename from NEXTCLOUD_MODULE_PLAN.md rename to MDfile/NEXTCLOUD_MODULE_PLAN.md diff --git a/PHASE_3_TASK_3_1_COMPLETE.md b/MDfile/PHASE_3_TASK_3_1_COMPLETE.md similarity index 100% rename from PHASE_3_TASK_3_1_COMPLETE.md rename to MDfile/PHASE_3_TASK_3_1_COMPLETE.md diff --git a/PRODUCTION_DEPLOYMENT.md b/MDfile/PRODUCTION_DEPLOYMENT.md similarity index 100% rename from PRODUCTION_DEPLOYMENT.md rename to MDfile/PRODUCTION_DEPLOYMENT.md diff --git a/PRODUCTION_QUICK_START.md b/MDfile/PRODUCTION_QUICK_START.md similarity index 100% rename from PRODUCTION_QUICK_START.md rename to MDfile/PRODUCTION_QUICK_START.md diff --git a/QUICK_UPDATE.md b/MDfile/QUICK_UPDATE.md similarity index 100% rename from QUICK_UPDATE.md rename to MDfile/QUICK_UPDATE.md diff --git a/README.md b/MDfile/README.md similarity index 100% rename from README.md rename to MDfile/README.md diff --git a/RELEASE_NOTES_v1.0.0.md b/MDfile/RELEASE_NOTES_v1.0.0.md similarity index 100% rename from RELEASE_NOTES_v1.0.0.md rename to MDfile/RELEASE_NOTES_v1.0.0.md diff --git a/RELEASE_NOTES_v1.3.5.md b/MDfile/RELEASE_NOTES_v1.3.5.md similarity index 100% rename from RELEASE_NOTES_v1.3.5.md rename to MDfile/RELEASE_NOTES_v1.3.5.md diff --git a/RELEASE_NOTES_v1.3.75.md b/MDfile/RELEASE_NOTES_v1.3.75.md similarity index 100% rename from RELEASE_NOTES_v1.3.75.md rename to MDfile/RELEASE_NOTES_v1.3.75.md diff --git a/RELEASE_NOTES_v1.3.76.md b/MDfile/RELEASE_NOTES_v1.3.76.md similarity index 100% rename from RELEASE_NOTES_v1.3.76.md rename to MDfile/RELEASE_NOTES_v1.3.76.md diff --git a/RELEASE_NOTES_v1.3.84.md b/MDfile/RELEASE_NOTES_v1.3.84.md similarity index 100% rename from RELEASE_NOTES_v1.3.84.md rename to MDfile/RELEASE_NOTES_v1.3.84.md diff --git a/RELEASE_NOTES_v2.0.0.md b/MDfile/RELEASE_NOTES_v2.0.0.md similarity index 100% rename from RELEASE_NOTES_v2.0.0.md rename to MDfile/RELEASE_NOTES_v2.0.0.md diff --git a/RELEASE_NOTES_v2.0.1.md b/MDfile/RELEASE_NOTES_v2.0.1.md similarity index 100% rename from RELEASE_NOTES_v2.0.1.md rename to MDfile/RELEASE_NOTES_v2.0.1.md diff --git a/RELEASE_NOTES_v2.0.2.md b/MDfile/RELEASE_NOTES_v2.0.2.md similarity index 100% rename from RELEASE_NOTES_v2.0.2.md rename to MDfile/RELEASE_NOTES_v2.0.2.md diff --git a/RELEASE_NOTES_v2.0.3.md b/MDfile/RELEASE_NOTES_v2.0.3.md similarity index 100% rename from RELEASE_NOTES_v2.0.3.md rename to MDfile/RELEASE_NOTES_v2.0.3.md diff --git a/RELEASE_NOTES_v2.0.4.md b/MDfile/RELEASE_NOTES_v2.0.4.md similarity index 100% rename from RELEASE_NOTES_v2.0.4.md rename to MDfile/RELEASE_NOTES_v2.0.4.md diff --git a/RELEASE_NOTES_v2.0.5.md b/MDfile/RELEASE_NOTES_v2.0.5.md similarity index 100% rename from RELEASE_NOTES_v2.0.5.md rename to MDfile/RELEASE_NOTES_v2.0.5.md diff --git a/RELEASE_NOTES_v2.0.6.md b/MDfile/RELEASE_NOTES_v2.0.6.md similarity index 100% rename from RELEASE_NOTES_v2.0.6.md rename to MDfile/RELEASE_NOTES_v2.0.6.md diff --git a/RELEASE_NOTES_v2.1.0.md b/MDfile/RELEASE_NOTES_v2.1.0.md similarity index 100% rename from RELEASE_NOTES_v2.1.0.md rename to MDfile/RELEASE_NOTES_v2.1.0.md diff --git a/RELEASE_NOTES_v2.1.1.md b/MDfile/RELEASE_NOTES_v2.1.1.md similarity index 100% rename from RELEASE_NOTES_v2.1.1.md rename to MDfile/RELEASE_NOTES_v2.1.1.md diff --git a/RELEASE_NOTES_v2.2.2.md b/MDfile/RELEASE_NOTES_v2.2.2.md similarity index 100% rename from RELEASE_NOTES_v2.2.2.md rename to MDfile/RELEASE_NOTES_v2.2.2.md diff --git a/RELEASE_NOTES_v2.2.3.md b/MDfile/RELEASE_NOTES_v2.2.3.md similarity index 100% rename from RELEASE_NOTES_v2.2.3.md rename to MDfile/RELEASE_NOTES_v2.2.3.md diff --git a/RELEASE_NOTES_v2.2.36.md b/MDfile/RELEASE_NOTES_v2.2.36.md similarity index 100% rename from RELEASE_NOTES_v2.2.36.md rename to MDfile/RELEASE_NOTES_v2.2.36.md diff --git a/RELEASE_NOTES_v2.2.39.md b/MDfile/RELEASE_NOTES_v2.2.39.md similarity index 100% rename from RELEASE_NOTES_v2.2.39.md rename to MDfile/RELEASE_NOTES_v2.2.39.md diff --git a/RELEASE_NOTES_v2.2.40.md b/MDfile/RELEASE_NOTES_v2.2.40.md similarity index 100% rename from RELEASE_NOTES_v2.2.40.md rename to MDfile/RELEASE_NOTES_v2.2.40.md diff --git a/RELEASE_NOTES_v2.2.41.md b/MDfile/RELEASE_NOTES_v2.2.41.md similarity index 100% rename from RELEASE_NOTES_v2.2.41.md rename to MDfile/RELEASE_NOTES_v2.2.41.md diff --git a/RELEASE_NOTES_v2.2.42.md b/MDfile/RELEASE_NOTES_v2.2.42.md similarity index 100% rename from RELEASE_NOTES_v2.2.42.md rename to MDfile/RELEASE_NOTES_v2.2.42.md diff --git a/RELEASE_NOTES_v2.2.43.md b/MDfile/RELEASE_NOTES_v2.2.43.md similarity index 100% rename from RELEASE_NOTES_v2.2.43.md rename to MDfile/RELEASE_NOTES_v2.2.43.md diff --git a/RELEASE_NOTES_v2.2.44.md b/MDfile/RELEASE_NOTES_v2.2.44.md similarity index 100% rename from RELEASE_NOTES_v2.2.44.md rename to MDfile/RELEASE_NOTES_v2.2.44.md diff --git a/RELEASE_NOTES_v2.2.45.md b/MDfile/RELEASE_NOTES_v2.2.45.md similarity index 100% rename from RELEASE_NOTES_v2.2.45.md rename to MDfile/RELEASE_NOTES_v2.2.45.md diff --git a/RELEASE_NOTES_v2.2.46.md b/MDfile/RELEASE_NOTES_v2.2.46.md similarity index 100% rename from RELEASE_NOTES_v2.2.46.md rename to MDfile/RELEASE_NOTES_v2.2.46.md diff --git a/RELEASE_NOTES_v2.2.47.md b/MDfile/RELEASE_NOTES_v2.2.47.md similarity index 100% rename from RELEASE_NOTES_v2.2.47.md rename to MDfile/RELEASE_NOTES_v2.2.47.md diff --git a/RELEASE_NOTES_v2.2.48.md b/MDfile/RELEASE_NOTES_v2.2.48.md similarity index 100% rename from RELEASE_NOTES_v2.2.48.md rename to MDfile/RELEASE_NOTES_v2.2.48.md diff --git a/RELEASE_NOTES_v2.2.49.md b/MDfile/RELEASE_NOTES_v2.2.49.md similarity index 100% rename from RELEASE_NOTES_v2.2.49.md rename to MDfile/RELEASE_NOTES_v2.2.49.md diff --git a/RELEASE_NOTES_v2.2.50.md b/MDfile/RELEASE_NOTES_v2.2.50.md similarity index 100% rename from RELEASE_NOTES_v2.2.50.md rename to MDfile/RELEASE_NOTES_v2.2.50.md diff --git a/RELEASE_NOTES_v2.2.51.md b/MDfile/RELEASE_NOTES_v2.2.51.md similarity index 100% rename from RELEASE_NOTES_v2.2.51.md rename to MDfile/RELEASE_NOTES_v2.2.51.md diff --git a/RELEASE_NOTES_v2.2.52.md b/MDfile/RELEASE_NOTES_v2.2.52.md similarity index 100% rename from RELEASE_NOTES_v2.2.52.md rename to MDfile/RELEASE_NOTES_v2.2.52.md diff --git a/RELEASE_NOTES_v2.2.53.md b/MDfile/RELEASE_NOTES_v2.2.53.md similarity index 100% rename from RELEASE_NOTES_v2.2.53.md rename to MDfile/RELEASE_NOTES_v2.2.53.md diff --git a/RELEASE_NOTES_v2.2.54.md b/MDfile/RELEASE_NOTES_v2.2.54.md similarity index 100% rename from RELEASE_NOTES_v2.2.54.md rename to MDfile/RELEASE_NOTES_v2.2.54.md diff --git a/RELEASE_NOTES_v2.2.56.md b/MDfile/RELEASE_NOTES_v2.2.56.md similarity index 100% rename from RELEASE_NOTES_v2.2.56.md rename to MDfile/RELEASE_NOTES_v2.2.56.md diff --git a/RELEASE_NOTES_v2.2.57.md b/MDfile/RELEASE_NOTES_v2.2.57.md similarity index 100% rename from RELEASE_NOTES_v2.2.57.md rename to MDfile/RELEASE_NOTES_v2.2.57.md diff --git a/RELEASE_NOTES_v2.2.58.md b/MDfile/RELEASE_NOTES_v2.2.58.md similarity index 100% rename from RELEASE_NOTES_v2.2.58.md rename to MDfile/RELEASE_NOTES_v2.2.58.md diff --git a/RELEASE_NOTES_v2.2.59.md b/MDfile/RELEASE_NOTES_v2.2.59.md similarity index 100% rename from RELEASE_NOTES_v2.2.59.md rename to MDfile/RELEASE_NOTES_v2.2.59.md diff --git a/RELEASE_NOTES_v2.2.60.md b/MDfile/RELEASE_NOTES_v2.2.60.md similarity index 100% rename from RELEASE_NOTES_v2.2.60.md rename to MDfile/RELEASE_NOTES_v2.2.60.md diff --git a/RELEASE_NOTES_v2.2.61.md b/MDfile/RELEASE_NOTES_v2.2.61.md similarity index 100% rename from RELEASE_NOTES_v2.2.61.md rename to MDfile/RELEASE_NOTES_v2.2.61.md diff --git a/RELEASE_NOTES_v2.2.62.md b/MDfile/RELEASE_NOTES_v2.2.62.md similarity index 100% rename from RELEASE_NOTES_v2.2.62.md rename to MDfile/RELEASE_NOTES_v2.2.62.md diff --git a/RELEASE_NOTES_v2.2.63.md b/MDfile/RELEASE_NOTES_v2.2.63.md similarity index 100% rename from RELEASE_NOTES_v2.2.63.md rename to MDfile/RELEASE_NOTES_v2.2.63.md diff --git a/RELEASE_NOTES_v2.2.64.md b/MDfile/RELEASE_NOTES_v2.2.64.md similarity index 100% rename from RELEASE_NOTES_v2.2.64.md rename to MDfile/RELEASE_NOTES_v2.2.64.md diff --git a/RELEASE_NOTES_v2.2.81.md b/MDfile/RELEASE_NOTES_v2.2.81.md similarity index 100% rename from RELEASE_NOTES_v2.2.81.md rename to MDfile/RELEASE_NOTES_v2.2.81.md diff --git a/RELEASE_NOTES_v2.2.82.md b/MDfile/RELEASE_NOTES_v2.2.82.md similarity index 100% rename from RELEASE_NOTES_v2.2.82.md rename to MDfile/RELEASE_NOTES_v2.2.82.md diff --git a/RELEASE_NOTES_v2.2.83.md b/MDfile/RELEASE_NOTES_v2.2.83.md similarity index 100% rename from RELEASE_NOTES_v2.2.83.md rename to MDfile/RELEASE_NOTES_v2.2.83.md diff --git a/RELEASE_NOTES_v2.2.84.md b/MDfile/RELEASE_NOTES_v2.2.84.md similarity index 100% rename from RELEASE_NOTES_v2.2.84.md rename to MDfile/RELEASE_NOTES_v2.2.84.md diff --git a/RELEASE_NOTES_v2.2.85.md b/MDfile/RELEASE_NOTES_v2.2.85.md similarity index 100% rename from RELEASE_NOTES_v2.2.85.md rename to MDfile/RELEASE_NOTES_v2.2.85.md diff --git a/RELEASE_NOTES_v2.2.86.md b/MDfile/RELEASE_NOTES_v2.2.86.md similarity index 100% rename from RELEASE_NOTES_v2.2.86.md rename to MDfile/RELEASE_NOTES_v2.2.86.md diff --git a/RELEASE_NOTES_v2.2.87.md b/MDfile/RELEASE_NOTES_v2.2.87.md similarity index 100% rename from RELEASE_NOTES_v2.2.87.md rename to MDfile/RELEASE_NOTES_v2.2.87.md diff --git a/RELEASE_NOTES_v2.3.1.md b/MDfile/RELEASE_NOTES_v2.3.1.md similarity index 100% rename from RELEASE_NOTES_v2.3.1.md rename to MDfile/RELEASE_NOTES_v2.3.1.md diff --git a/RELEASE_NOTES_v2.3.2.md b/MDfile/RELEASE_NOTES_v2.3.2.md similarity index 100% rename from RELEASE_NOTES_v2.3.2.md rename to MDfile/RELEASE_NOTES_v2.3.2.md diff --git a/RELEASE_NOTES_v2.3.3.md b/MDfile/RELEASE_NOTES_v2.3.3.md similarity index 100% rename from RELEASE_NOTES_v2.3.3.md rename to MDfile/RELEASE_NOTES_v2.3.3.md diff --git a/RELEASE_NOTES_v2.3.4.md b/MDfile/RELEASE_NOTES_v2.3.4.md similarity index 100% rename from RELEASE_NOTES_v2.3.4.md rename to MDfile/RELEASE_NOTES_v2.3.4.md diff --git a/RELEASE_NOTES_v2.3.5.md b/MDfile/RELEASE_NOTES_v2.3.5.md similarity index 100% rename from RELEASE_NOTES_v2.3.5.md rename to MDfile/RELEASE_NOTES_v2.3.5.md diff --git a/RELEASE_NOTES_v2.3.6.md b/MDfile/RELEASE_NOTES_v2.3.6.md similarity index 100% rename from RELEASE_NOTES_v2.3.6.md rename to MDfile/RELEASE_NOTES_v2.3.6.md diff --git a/RELEASE_NOTES_v2.3.7.md b/MDfile/RELEASE_NOTES_v2.3.7.md similarity index 100% rename from RELEASE_NOTES_v2.3.7.md rename to MDfile/RELEASE_NOTES_v2.3.7.md diff --git a/RELEASE_NOTES_v2.3.8.md b/MDfile/RELEASE_NOTES_v2.3.8.md similarity index 100% rename from RELEASE_NOTES_v2.3.8.md rename to MDfile/RELEASE_NOTES_v2.3.8.md diff --git a/RELEASE_NOTES_v2.3.md b/MDfile/RELEASE_NOTES_v2.3.md similarity index 100% rename from RELEASE_NOTES_v2.3.md rename to MDfile/RELEASE_NOTES_v2.3.md diff --git a/REMINDER_SYSTEM_IMPLEMENTATION.md b/MDfile/REMINDER_SYSTEM_IMPLEMENTATION.md similarity index 100% rename from REMINDER_SYSTEM_IMPLEMENTATION.md rename to MDfile/REMINDER_SYSTEM_IMPLEMENTATION.md diff --git a/REMINDER_SYSTEM_QUICKSTART.md b/MDfile/REMINDER_SYSTEM_QUICKSTART.md similarity index 100% rename from REMINDER_SYSTEM_QUICKSTART.md rename to MDfile/REMINDER_SYSTEM_QUICKSTART.md diff --git a/SAG_MODULE_COMPLETION_REPORT.md b/MDfile/SAG_MODULE_COMPLETION_REPORT.md similarity index 100% rename from SAG_MODULE_COMPLETION_REPORT.md rename to MDfile/SAG_MODULE_COMPLETION_REPORT.md diff --git a/SAG_MODULE_IMPLEMENTATION_PLAN.md b/MDfile/SAG_MODULE_IMPLEMENTATION_PLAN.md similarity index 100% rename from SAG_MODULE_IMPLEMENTATION_PLAN.md rename to MDfile/SAG_MODULE_IMPLEMENTATION_PLAN.md diff --git a/SAG_MODULE_PLAN.md b/MDfile/SAG_MODULE_PLAN.md similarity index 100% rename from SAG_MODULE_PLAN.md rename to MDfile/SAG_MODULE_PLAN.md diff --git a/SALES_AND_AGGREGATION_PLAN.md b/MDfile/SALES_AND_AGGREGATION_PLAN.md similarity index 100% rename from SALES_AND_AGGREGATION_PLAN.md rename to MDfile/SALES_AND_AGGREGATION_PLAN.md diff --git a/SERVICE_CONTRACT_WIZARD_README.md b/MDfile/SERVICE_CONTRACT_WIZARD_README.md similarity index 100% rename from SERVICE_CONTRACT_WIZARD_README.md rename to MDfile/SERVICE_CONTRACT_WIZARD_README.md diff --git a/TEMPLATES_FINAL_VERIFICATION.md b/MDfile/TEMPLATES_FINAL_VERIFICATION.md similarity index 100% rename from TEMPLATES_FINAL_VERIFICATION.md rename to MDfile/TEMPLATES_FINAL_VERIFICATION.md diff --git a/TEMPLATES_QUICK_REFERENCE.md b/MDfile/TEMPLATES_QUICK_REFERENCE.md similarity index 100% rename from TEMPLATES_QUICK_REFERENCE.md rename to MDfile/TEMPLATES_QUICK_REFERENCE.md diff --git a/TEMPLATE_IMPLEMENTATION_SUMMARY.md b/MDfile/TEMPLATE_IMPLEMENTATION_SUMMARY.md similarity index 100% rename from TEMPLATE_IMPLEMENTATION_SUMMARY.md rename to MDfile/TEMPLATE_IMPLEMENTATION_SUMMARY.md diff --git a/app/core/config.py b/app/core/config.py index 9752e4c..cd5c27b 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -315,6 +315,15 @@ class Settings(BaseSettings): FEDEX_BASE_URL: str = "" FEDEX_TIMEOUT_SECONDS: int = 20 + # ALSO Cloud Marketplace Integration + ALSO_ENABLED: bool = False + ALSO_READ_ONLY: bool = True + ALSO_DRY_RUN: bool = True + ALSO_API_BASE_URL: str = "" + ALSO_API_KEY: str = "" + ALSO_API_SECRET: str = "" + ALSO_TIMEOUT_SECONDS: int = 20 + # Bottom bar module BOTTOM_BAR_ENABLED: bool = False diff --git a/app/customers/backend/router.py b/app/customers/backend/router.py index 6365428..67f2018 100644 --- a/app/customers/backend/router.py +++ b/app/customers/backend/router.py @@ -5,7 +5,7 @@ Adapted from OmniSync for BMC Hub """ from fastapi import APIRouter, HTTPException, Query -from typing import List, Optional, Dict +from typing import List, Optional, Dict, Any from pydantic import BaseModel import logging import asyncio @@ -1780,3 +1780,139 @@ async def get_subscription_billing_matrix( logger.error(f"❌ Error generating billing matrix: {e}") raise HTTPException(status_code=500, detail=str(e)) + +@router.get("/customers/{customer_id}/acmp") +async def get_customer_acmp_overview( + customer_id: int, + months: int = Query(default=6, ge=1, le=24, description="Months for trend data"), +): + """Return ACMP (ALSO Cloud Marketplace) detail and statistics for one customer.""" + try: + customer = execute_query_single("SELECT id, name FROM customers WHERE id = %s", (customer_id,)) + if not customer: + raise HTTPException(status_code=404, detail=f"Customer {customer_id} not found") + + table_check = execute_query_single("SELECT to_regclass('public.also_import_lines') AS table_name") + if not table_check or not table_check.get("table_name"): + return { + "customer_id": customer_id, + "customer_name": customer.get("name"), + "available": False, + "message": "ACMP data is not available yet (missing also_import_lines table)", + "summary": {}, + "status_breakdown": [], + "products": [], + "monthly": [], + } + + summary = execute_query_single( + """ + WITH scoped AS ( + SELECT * + FROM also_import_lines + WHERE matched_customer_id = %s + ) + SELECT + COUNT(*) AS line_count, + COUNT(DISTINCT COALESCE(material_number, product_name, 'ukendt')) AS distinct_products, + COALESCE(SUM(COALESCE(total_price, sales_price, 0)), 0) AS revenue_total, + COALESCE(SUM(COALESCE(cost_amount, 0)), 0) AS cost_total, + COALESCE(SUM(COALESCE(total_price, sales_price, 0) - COALESCE(cost_amount, 0)), 0) AS margin_total, + COUNT(*) FILTER (WHERE queue_status = 'ready_for_approval') AS pending_approvals, + COUNT(*) FILTER (WHERE queue_status = 'error') AS error_count, + COALESCE( + SUM(COALESCE(total_price, sales_price, 0)) FILTER ( + WHERE date_trunc('month', COALESCE(billing_start::timestamp, created_at)) = date_trunc('month', CURRENT_DATE) + ), + 0 + ) AS revenue_month, + COALESCE( + SUM(COALESCE(cost_amount, 0)) FILTER ( + WHERE date_trunc('month', COALESCE(billing_start::timestamp, created_at)) = date_trunc('month', CURRENT_DATE) + ), + 0 + ) AS cost_month + FROM scoped + """, + (customer_id,), + ) or {} + + status_breakdown = execute_query( + """ + SELECT queue_status, COUNT(*)::INTEGER AS count + FROM also_import_lines + WHERE matched_customer_id = %s + GROUP BY queue_status + ORDER BY count DESC, queue_status ASC + """, + (customer_id,), + ) or [] + + products = execute_query( + """ + SELECT + COALESCE(material_number, 'N/A') AS material_number, + COALESCE(vendor, 'N/A') AS vendor, + COALESCE(product_name, 'Ukendt produkt') AS product_name, + COUNT(*)::INTEGER AS line_count, + COALESCE(SUM(COALESCE(billable_parameters, 1)), 0) AS quantity_total, + COALESCE(SUM(COALESCE(total_price, sales_price, 0)), 0) AS revenue_total, + COALESCE(SUM(COALESCE(cost_amount, 0)), 0) AS cost_total, + COALESCE(SUM(COALESCE(total_price, sales_price, 0) - COALESCE(cost_amount, 0)), 0) AS margin_total, + MAX(billing_start) AS last_billing_start, + MAX(created_at) AS last_seen_at + FROM also_import_lines + WHERE matched_customer_id = %s + GROUP BY COALESCE(material_number, 'N/A'), COALESCE(vendor, 'N/A'), COALESCE(product_name, 'Ukendt produkt') + ORDER BY revenue_total DESC, quantity_total DESC + LIMIT 200 + """, + (customer_id,), + ) or [] + + monthly = execute_query( + """ + SELECT + TO_CHAR(date_trunc('month', COALESCE(billing_start::timestamp, created_at)), 'YYYY-MM') AS month, + COALESCE(SUM(COALESCE(billable_parameters, 1)), 0) AS quantity_total, + COALESCE(SUM(COALESCE(total_price, sales_price, 0)), 0) AS revenue_total, + COALESCE(SUM(COALESCE(cost_amount, 0)), 0) AS cost_total, + COALESCE(SUM(COALESCE(total_price, sales_price, 0) - COALESCE(cost_amount, 0)), 0) AS margin_total, + COUNT(*)::INTEGER AS lines + FROM also_import_lines + WHERE matched_customer_id = %s + AND date_trunc('month', COALESCE(billing_start::timestamp, created_at)) >= date_trunc('month', CURRENT_DATE) - ((%s - 1) * INTERVAL '1 month') + GROUP BY date_trunc('month', COALESCE(billing_start::timestamp, created_at)) + ORDER BY month ASC + """, + (customer_id, months), + ) or [] + + response: Dict[str, Any] = { + "customer_id": customer_id, + "customer_name": customer.get("name"), + "available": True, + "summary": { + "line_count": int(summary.get("line_count") or 0), + "distinct_products": int(summary.get("distinct_products") or 0), + "revenue_total": summary.get("revenue_total") or 0, + "cost_total": summary.get("cost_total") or 0, + "margin_total": summary.get("margin_total") or 0, + "revenue_month": summary.get("revenue_month") or 0, + "cost_month": summary.get("cost_month") or 0, + "margin_month": (summary.get("revenue_month") or 0) - (summary.get("cost_month") or 0), + "pending_approvals": int(summary.get("pending_approvals") or 0), + "error_count": int(summary.get("error_count") or 0), + }, + "status_breakdown": status_breakdown, + "products": products, + "monthly": monthly, + } + return response + + except HTTPException: + raise + except Exception as e: + logger.error("❌ Error fetching ACMP overview for customer %s: %s", customer_id, e) + raise HTTPException(status_code=500, detail=str(e)) + diff --git a/app/customers/frontend/customer_detail.html b/app/customers/frontend/customer_detail.html index f420252..af6dcf8 100644 --- a/app/customers/frontend/customer_detail.html +++ b/app/customers/frontend/customer_detail.html @@ -62,6 +62,24 @@ border-radius: 12px; padding: 1.5rem; } + + .acmp-stat-card { + background: var(--bg-card); + border: 1px solid rgba(15, 76, 117, 0.14); + border-radius: 12px; + padding: 1rem; + } + + .acmp-stat-label { + color: var(--text-secondary); + font-size: 0.85rem; + } + + .acmp-stat-value { + font-size: 1.2rem; + font-weight: 700; + color: var(--text-primary); + } .info-row { display: flex; @@ -228,9 +246,33 @@ .contacts-panel { background: var(--bg-card); - border: 1px solid rgba(0, 0, 0, 0.08); + border: 1px solid rgba(15, 76, 117, 0.14); border-radius: 14px; overflow: hidden; + box-shadow: 0 10px 28px rgba(15, 76, 117, 0.08); + } + + .contacts-toolbar { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + gap: 0.65rem; + margin-bottom: 0.9rem; + padding: 0.78rem 0.9rem; + background: linear-gradient(135deg, rgba(15, 76, 117, 0.08) 0%, rgba(15, 76, 117, 0.02) 100%); + border: 1px solid rgba(15, 76, 117, 0.12); + border-radius: 12px; + } + + .contacts-search { + max-width: 460px; + min-width: 280px; + } + + .contacts-search .form-control, + .contacts-search .input-group-text { + border-color: rgba(15, 76, 117, 0.2); } .contacts-table { @@ -259,6 +301,18 @@ color: var(--text-primary); } + .contacts-table .contact-name-link { + color: var(--text-primary); + text-decoration: none; + border-bottom: 1px solid transparent; + transition: color 0.15s ease, border-color 0.15s ease; + } + + .contacts-table .contact-name-link:hover { + color: var(--accent); + border-color: rgba(15, 76, 117, 0.35); + } + .contacts-table .contact-email a { overflow-wrap: anywhere; } @@ -267,6 +321,7 @@ white-space: nowrap; } + .contacts-table .contact-phone-wrap, .contacts-table .contact-mobile-wrap { display: inline-flex; align-items: center; @@ -274,6 +329,12 @@ flex-wrap: wrap; } + .contacts-table .btn-voip { + border-color: rgba(25, 135, 84, 0.6); + color: #198754; + } + + .contacts-table .contact-phone-wrap .btn, .contacts-table .contact-mobile-wrap .btn { padding: 0.18rem 0.52rem; line-height: 1.2; @@ -285,6 +346,16 @@ } @media (max-width: 992px) { + .contacts-toolbar { + padding: 0.7rem; + } + + .contacts-search { + max-width: none; + min-width: 0; + width: 100%; + } + #contactsContainer { min-width: 920px; } @@ -406,6 +477,11 @@ Abonnements Matrix +
  • + + ACMP + +
  • Lokationer @@ -622,6 +698,17 @@ Tilføj Kontakt +
    +
    + + +
    +
    + + + 0 +
    +
    @@ -850,6 +937,105 @@ + +
    +
    +
    + ACMP Detaljer + (ALSO Cloud Marketplace) +
    + +
    + +
    + +

    Henter ACMP-data...

    +
    + + + +
    + + + + + + + + +
    MĂĄnedOms.DB
    +
    +
    + + + +
    +
    +
    Produkter
    + Top 200 pr. omsætning +
    +
    + + + + + + + + + + + + +
    ProduktMaterialeVendorAntalOmsætningDB
    +
    +
    + + +
    @@ -1838,12 +2024,13 @@ function displayCustomer(customer) { } function renderCustomerCallNumber(number) { - const clean = String(number || '').trim(); + const clean = normalizePhoneValue(number); if (!clean) return '-'; return `
    ${escapeHtml(clean)} +
    `; } @@ -1864,8 +2051,8 @@ async function ensureCustomerDetailCurrentUserId() { } async function customerDetailCallViaYealink(number) { - const clean = String(number || '').trim(); - if (!clean || clean === '-') { + const clean = normalizePhoneValue(number); + if (!clean) { alert('Intet gyldigt nummer at ringe til'); return; } @@ -2655,9 +2842,193 @@ function displayUtilityCompany(payload) { contactEl.innerHTML = contactPieces.length > 0 ? contactPieces.join(' • ') : 'Ingen kontaktinfo'; } +function normalizePhoneValue(value) { + const clean = String(value || '').trim(); + if (!clean) return ''; + + const lowered = clean.toLowerCase(); + if (clean === '-' || clean === '—' || lowered === 'n/a' || lowered === 'null' || lowered === 'none') { + return ''; + } + + // Require at least one digit to treat value as a callable/SMS-capable number. + if (!/[0-9]/.test(clean)) { + return ''; + } + + return clean; +} + +let customerContactsData = []; +let contactsSearchQuery = ''; +let contactsOnlyCallable = false; +let contactsFilterControlsInitialized = false; + +function getContactDisplayName(contact) { + const firstName = String(contact.first_name || '').trim(); + const lastName = String(contact.last_name || '').trim(); + return [firstName, lastName].filter(Boolean).join(' ') || String(contact.name || '').trim() || '—'; +} + +function getContactPhoneValue(contact) { + return normalizePhoneValue(contact.phone); +} + +function getContactMobileValue(contact) { + return normalizePhoneValue(contact.mobile || contact.mobile_phone); +} + +function buildContactsRows(contacts) { + return contacts.map(contact => { + const displayName = getContactDisplayName(contact); + const contactId = Number(contact.id) || null; + const mobileValue = getContactMobileValue(contact); + const phoneValue = getContactPhoneValue(contact); + const titleValue = String(contact.title || contact.role || '').trim(); + const nameCell = contactId + ? `    ${escapeHtml(displayName)}` + : escapeHtml(displayName); + + const email = contact.email ? `${escapeHtml(contact.email)}` : '—'; + const phone = phoneValue + ? `
    ${escapeHtml(phoneValue)}
    ` + : '—'; + const mobile = mobileValue + ? `
    ${escapeHtml(mobileValue)}
    ` + : '—'; + const title = titleValue ? escapeHtml(titleValue) : '—'; + const primaryBadge = contact.is_primary ? 'Primær' : '—'; + + return ` + + ${nameCell} + ${title} + ${email} + ${phone} + ${mobile} + ${primaryBadge} + + `; + }).join(''); +} + +function getFilteredContacts() { + const query = contactsSearchQuery.toLowerCase(); + return customerContactsData.filter(contact => { + const displayName = getContactDisplayName(contact); + const phoneValue = getContactPhoneValue(contact); + const mobileValue = getContactMobileValue(contact); + const searchable = [ + displayName, + String(contact.title || contact.role || ''), + String(contact.email || ''), + phoneValue, + mobileValue + ].join(' ').toLowerCase(); + + const matchesQuery = !query || searchable.includes(query); + const matchesCallable = !contactsOnlyCallable || Boolean(phoneValue || mobileValue); + return matchesQuery && matchesCallable; + }); +} + +function updateContactsResultCount(current, total) { + const countEl = document.getElementById('contactsResultCount'); + if (!countEl) return; + countEl.textContent = `${current} / ${total}`; +} + +function bindContactVoipButtons() { + document.querySelectorAll('.js-contact-voip').forEach((btn) => { + btn.addEventListener('click', () => { + const number = String(btn.getAttribute('data-number') || '').trim(); + customerDetailCallViaYealink(number); + }); + }); +} + +function renderContactsFromState() { + const container = document.getElementById('contactsContainer'); + if (!container) return; + + const renderContactsTable = (bodyHtml) => ` + + + + + + + + + + + + + ${bodyHtml} + +
    NavnTitelEmailTelefonMobilPrimær
    + `; + + if (!customerContactsData.length) { + container.innerHTML = '
    Ingen kontakter endnu
    '; + updateContactsResultCount(0, 0); + return; + } + + const filteredContacts = getFilteredContacts(); + updateContactsResultCount(filteredContacts.length, customerContactsData.length); + + if (!filteredContacts.length) { + container.innerHTML = '
    Ingen kontakter matcher søgningen
    '; + return; + } + + container.innerHTML = renderContactsTable(buildContactsRows(filteredContacts)); + bindContactVoipButtons(); +} + +function initContactsFilterControls() { + if (contactsFilterControlsInitialized) return; + + const searchInput = document.getElementById('contactsSearchInput'); + const callableBtn = document.getElementById('contactsOnlyCallableToggle'); + const clearBtn = document.getElementById('contactsClearFilters'); + + if (!searchInput || !callableBtn || !clearBtn) return; + + const syncCallableBtn = () => { + callableBtn.classList.toggle('btn-outline-secondary', !contactsOnlyCallable); + callableBtn.classList.toggle('btn-primary', contactsOnlyCallable); + }; + + searchInput.addEventListener('input', (event) => { + contactsSearchQuery = String(event.target.value || '').trim(); + renderContactsFromState(); + }); + + callableBtn.addEventListener('click', () => { + contactsOnlyCallable = !contactsOnlyCallable; + syncCallableBtn(); + renderContactsFromState(); + }); + + clearBtn.addEventListener('click', () => { + contactsSearchQuery = ''; + contactsOnlyCallable = false; + searchInput.value = ''; + syncCallableBtn(); + renderContactsFromState(); + }); + + syncCallableBtn(); + contactsFilterControlsInitialized = true; +} + async function loadContacts() { const container = document.getElementById('contactsContainer'); + initContactsFilterControls(); + const renderContactsTable = (bodyHtml) => ` @@ -2689,45 +3060,12 @@ async function loadContacts() { try { const response = await fetch(`/api/v1/customers/${customerId}/contacts`); const contacts = await response.json(); - - if (!contacts || contacts.length === 0) { - container.innerHTML = '
    Ingen kontakter endnu
    '; - return; - } - - const rows = contacts.map(contact => { - const firstName = String(contact.first_name || '').trim(); - const lastName = String(contact.last_name || '').trim(); - const displayName = [firstName, lastName].filter(Boolean).join(' ') || String(contact.name || '').trim() || '—'; - const mobileValue = String(contact.mobile || contact.mobile_phone || '').trim(); - const phoneValue = String(contact.phone || '').trim(); - const titleValue = String(contact.title || contact.role || '').trim(); - - const email = contact.email ? `${escapeHtml(contact.email)}` : '—'; - const phone = phoneValue ? `${escapeHtml(phoneValue)}` : '—'; - const mobile = mobileValue - ? `
    ${escapeHtml(mobileValue)}
    ` - : '—'; - const title = titleValue ? escapeHtml(titleValue) : '—'; - const primaryBadge = contact.is_primary ? 'Primær' : '—'; - - return ` - - - - - - - - - `; - }).join(''); - - container.innerHTML = ` - ${renderContactsTable(rows)} - `; + customerContactsData = Array.isArray(contacts) ? contacts : []; + renderContactsFromState(); } catch (error) { console.error('Failed to load contacts:', error); + customerContactsData = []; + updateContactsResultCount(0, 0); container.innerHTML = '
    Kunne ikke indlæse kontakter
    '; } } @@ -4705,6 +5043,80 @@ function displayInternalComment(data) { } } +async function loadAcmpOverview() { + const loading = document.getElementById('acmpLoading'); + const container = document.getElementById('acmpContainer'); + const empty = document.getElementById('acmpEmpty'); + + loading.style.display = 'block'; + container.style.display = 'none'; + empty.style.display = 'none'; + + try { + const response = await fetch(`/api/v1/customers/${customerId}/acmp?months=6`); + const payload = await response.json(); + + if (!response.ok) { + throw new Error(payload.detail || 'Kunne ikke hente ACMP-data'); + } + + if (!payload.available || (!payload.products || payload.products.length === 0)) { + empty.style.display = 'block'; + loading.style.display = 'none'; + return; + } + + renderAcmpOverview(payload); + container.style.display = 'block'; + loading.style.display = 'none'; + } catch (error) { + console.error('Failed to load ACMP overview:', error); + loading.innerHTML = `
    ${error.message}
    `; + } +} + +function renderAcmpOverview(payload) { + const summary = payload.summary || {}; + + document.getElementById('acmpRevenueMonth').textContent = formatDKK(Number(summary.revenue_month || 0)); + document.getElementById('acmpMarginMonth').textContent = formatDKK(Number(summary.margin_month || 0)); + document.getElementById('acmpDistinctProducts').textContent = Number(summary.distinct_products || 0).toLocaleString('da-DK'); + document.getElementById('acmpPendingApprovals').textContent = Number(summary.pending_approvals || 0).toLocaleString('da-DK'); + + const statusContainer = document.getElementById('acmpStatusBreakdown'); + const statusRows = payload.status_breakdown || []; + statusContainer.innerHTML = statusRows.length > 0 + ? statusRows.map(row => `${escapeHtml(row.queue_status)}: ${Number(row.count || 0).toLocaleString('da-DK')}`).join('') + : 'Ingen statusdata'; + + const monthlyRows = document.getElementById('acmpMonthlyRows'); + const monthly = payload.monthly || []; + monthlyRows.innerHTML = monthly.length > 0 + ? monthly.map(row => ` + + + + + + `).join('') + : ''; + + const productsRows = document.getElementById('acmpProductsRows'); + const products = payload.products || []; + productsRows.innerHTML = products.length > 0 + ? products.map(row => ` + + + + + + + + + `).join('') + : ''; +} + function editInternalComment() { const commentText = document.getElementById('commentText').textContent; const commentInput = document.getElementById('internalCommentInput'); @@ -4919,6 +5331,17 @@ document.addEventListener('DOMContentLoaded', () => { } }); } + + const acmpTab = document.querySelector('a[href="#acmp"]'); + if (acmpTab) { + acmpTab.addEventListener('shown.bs.tab', () => { + const loading = document.getElementById('acmpLoading'); + const container = document.getElementById('acmpContainer'); + if (loading && container && loading.style.display !== 'none' && container.style.display === 'none') { + loadAcmpOverview(); + } + }); + } }); diff --git a/fix_js2.py b/app/modules/also/__init__.py similarity index 100% rename from fix_js2.py rename to app/modules/also/__init__.py diff --git a/app/modules/also/backend/__init__.py b/app/modules/also/backend/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/modules/also/backend/router.py b/app/modules/also/backend/router.py new file mode 100644 index 0000000..4b844c1 --- /dev/null +++ b/app/modules/also/backend/router.py @@ -0,0 +1,114 @@ +from typing import Optional + +from fastapi import APIRouter, Query, Request + +from app.modules.also.backend.service import also_service +from app.modules.also.models.schemas import ( + AlsoApproveResult, + AlsoCompanyMappingUpsert, + AlsoDifferenceItem, + AlsoDashboardSummaryResponse, + AlsoImportJobCreate, + AlsoImportJobResponse, + AlsoImportLinesRequest, + AlsoProductMappingUpsert, + AlsoQueueApproveRequest, + AlsoQueueLineResponse, + AlsoQueueProcessRequest, + AlsoQueueProcessResult, +) + +router = APIRouter() + + +def _user_id_from_request(request: Request) -> Optional[int]: + raw_user_id = getattr(request.state, "user_id", None) + if raw_user_id is None: + return None + try: + return int(raw_user_id) + except (TypeError, ValueError): + return None + + +@router.get("/also/config") +async def also_config() -> dict: + return also_service.get_config() + + +@router.post("/also/import-jobs", response_model=AlsoImportJobResponse) +async def create_import_job(payload: AlsoImportJobCreate, request: Request): + return also_service.create_import_job(payload, _user_id_from_request(request)) + + +@router.get("/also/import-jobs", response_model=list[AlsoImportJobResponse]) +async def list_import_jobs( + status: Optional[str] = Query(default=None), + limit: int = Query(default=100, ge=1, le=500), +): + return also_service.list_import_jobs(status=status, limit=limit) + + +@router.get("/also/import-jobs/{job_id}", response_model=AlsoImportJobResponse) +async def get_import_job(job_id: int): + return also_service.get_import_job(job_id) + + +@router.post("/also/import-jobs/{job_id}/lines") +async def import_lines(job_id: int, payload: AlsoImportLinesRequest): + return also_service.import_lines(job_id=job_id, payload=payload) + + +@router.get("/also/queue", response_model=list[AlsoQueueLineResponse]) +async def get_queue( + status: Optional[str] = Query(default=None), + limit: int = Query(default=200, ge=1, le=1000), +): + return also_service.get_queue(status=status, limit=limit) + + +@router.get("/also/dashboard/summary", response_model=AlsoDashboardSummaryResponse) +async def get_dashboard_summary(): + return also_service.get_dashboard_summary() + + +@router.get("/also/dashboard/differences", response_model=list[AlsoDifferenceItem]) +async def get_dashboard_differences(limit: int = Query(default=50, ge=1, le=200)): + return also_service.get_monthly_differences(limit=limit) + + +@router.post("/also/queue/run-matching", response_model=AlsoQueueProcessResult) +async def run_matching(payload: AlsoQueueProcessRequest): + return also_service.run_matching( + import_job_id=payload.import_job_id, + line_ids=payload.line_ids, + limit=payload.limit, + ) + + +@router.post("/also/queue/run-validation", response_model=AlsoQueueProcessResult) +async def run_validation(payload: AlsoQueueProcessRequest): + return also_service.run_validation( + import_job_id=payload.import_job_id, + line_ids=payload.line_ids, + limit=payload.limit, + ) + + +@router.post("/also/queue/approve", response_model=AlsoApproveResult) +async def approve_queue(payload: AlsoQueueApproveRequest, request: Request): + return also_service.approve_lines_to_drafts( + import_job_id=payload.import_job_id, + line_ids=payload.line_ids, + approved_by_user_id=_user_id_from_request(request), + ) + + +@router.put("/also/mappings/company") +async def upsert_company_mapping(payload: AlsoCompanyMappingUpsert): + return also_service.upsert_company_mapping(payload) + + +@router.put("/also/mappings/product") +async def upsert_product_mapping(payload: AlsoProductMappingUpsert): + return also_service.upsert_product_mapping(payload) diff --git a/app/modules/also/backend/service.py b/app/modules/also/backend/service.py new file mode 100644 index 0000000..fde13d7 --- /dev/null +++ b/app/modules/also/backend/service.py @@ -0,0 +1,907 @@ +import hashlib +import json +import logging +from datetime import datetime +from decimal import Decimal +import re +from typing import Any, Dict, List, Optional + +from fastapi import HTTPException + +from app.core.config import settings +from app.core.database import execute_query, execute_query_single, table_has_column +from app.modules.also.models.schemas import ( + AlsoCompanyMappingUpsert, + AlsoImportJobCreate, + AlsoImportLinesRequest, + AlsoProductMappingUpsert, +) + +logger = logging.getLogger(__name__) + + +def _json_default(value: Any) -> Any: + if isinstance(value, Decimal): + return float(value) + if isinstance(value, datetime): + return value.isoformat() + return str(value) + + +def _json_dumps(value: Any) -> str: + return json.dumps(value, ensure_ascii=False, default=_json_default) + + +def _normalized_text(value: Optional[Any]) -> str: + return str(value or "").strip() + + +def _to_decimal(value: Any, default: Decimal = Decimal("0")) -> Decimal: + if value is None or value == "": + return default + try: + return Decimal(str(value)) + except Exception: + return default + + +def _normalize_cvr(vat_value: Optional[str]) -> str: + digits = re.sub(r"[^0-9]", "", _normalized_text(vat_value)) + return digits + + +def _line_hash(job_id: int, line_payload: Dict[str, Any]) -> str: + source_ref = _normalized_text(line_payload.get("source_line_ref")) + if source_ref: + key = f"{job_id}|{source_ref}" + else: + key = "|".join( + [ + str(job_id), + _normalized_text(line_payload.get("company")).lower(), + _normalized_text(line_payload.get("customer_id")), + _normalized_text(line_payload.get("material_number")), + _normalized_text(line_payload.get("vendor")).lower(), + _normalized_text(line_payload.get("billing_start")), + _normalized_text(line_payload.get("total_price")), + ] + ) + return hashlib.sha256(key.encode("utf-8")).hexdigest() + + +class AlsoService: + @property + def enabled(self) -> bool: + return bool(settings.ALSO_ENABLED) + + @property + def read_only(self) -> bool: + return bool(settings.ALSO_READ_ONLY) + + @property + def dry_run(self) -> bool: + return bool(settings.ALSO_DRY_RUN) + + def _assert_enabled(self) -> None: + if not self.enabled: + raise HTTPException(status_code=503, detail="ALSO integration is disabled") + + def get_config(self) -> Dict[str, Any]: + return { + "enabled": self.enabled, + "read_only": self.read_only, + "dry_run": self.dry_run, + "api_base_url": settings.ALSO_API_BASE_URL, + "preferred_import_order": ["api", "xml", "json_export", "xml_export", "csv"], + } + + def _resolve_customer_match(self, line: Dict[str, Any]) -> Optional[int]: + also_company_id = _normalized_text(line.get("also_company_id")) + if also_company_id: + mapped = execute_query_single( + """ + SELECT customer_id + FROM also_company_mapping + WHERE also_company_id = %s AND is_active = true + LIMIT 1 + """, + (also_company_id,), + ) + if mapped and mapped.get("customer_id"): + return int(mapped["customer_id"]) + + external_customer_id = _normalized_text(line.get("customer_id")) + if external_customer_id: + row = execute_query_single( + "SELECT id FROM customers WHERE vtiger_id = %s LIMIT 1", + (external_customer_id,), + ) + if row and row.get("id"): + return int(row["id"]) + + vat = _normalize_cvr(line.get("vat")) + if vat: + cvr_column = "cvr_number" if table_has_column("customers", "cvr_number") else None + if cvr_column: + row = execute_query_single( + f"SELECT id FROM customers WHERE REPLACE(REPLACE(COALESCE({cvr_column}, ''), ' ', ''), '-', '') = %s LIMIT 1", + (vat,), + ) + if row and row.get("id"): + return int(row["id"]) + + company_name = _normalized_text(line.get("company")) + if company_name: + row = execute_query_single( + "SELECT id FROM customers WHERE LOWER(name) = LOWER(%s) LIMIT 1", + (company_name,), + ) + if row and row.get("id"): + return int(row["id"]) + + return None + + def _resolve_product_match(self, line: Dict[str, Any]) -> Optional[int]: + material_number = _normalized_text(line.get("material_number")) + vendor = _normalized_text(line.get("vendor")) + product_name = _normalized_text(line.get("product_name")) + + if material_number and vendor: + mapped = execute_query_single( + """ + SELECT hub_product_id + FROM also_product_mapping + WHERE material_number = %s + AND LOWER(vendor) = LOWER(%s) + AND is_active = true + LIMIT 1 + """, + (material_number, vendor), + ) + if mapped and mapped.get("hub_product_id"): + return int(mapped["hub_product_id"]) + + if material_number: + supplier = execute_query_single( + """ + SELECT product_id + FROM product_suppliers + WHERE supplier_sku = %s + AND ( + %s = '' OR LOWER(COALESCE(supplier_name, '')) = LOWER(%s) OR LOWER(COALESCE(supplier_code, '')) = LOWER(%s) + ) + ORDER BY id ASC + LIMIT 1 + """, + (material_number, vendor, vendor, vendor), + ) + if supplier and supplier.get("product_id"): + return int(supplier["product_id"]) + + if product_name: + row = execute_query_single( + "SELECT id FROM products WHERE LOWER(name) = LOWER(%s) LIMIT 1", + (product_name,), + ) + if row and row.get("id"): + return int(row["id"]) + + return None + + def _derive_queue_status(self, matched_customer_id: Optional[int], matched_product_id: Optional[int], has_errors: bool) -> str: + if has_errors: + return "error" + if matched_customer_id and matched_product_id: + return "ready_for_approval" + if not matched_customer_id and matched_product_id: + return "matching_customers" + if matched_customer_id and not matched_product_id: + return "matching_products" + return "new" + + def _build_validation_errors(self, line: Dict[str, Any], duplicate_ids: set[int]) -> List[Dict[str, Any]]: + errors: List[Dict[str, Any]] = [] + + if not line.get("matched_customer_id"): + errors.append({"code": "customer_not_found", "message": "Kunde ikke fundet/matchet"}) + + if not line.get("matched_product_id"): + errors.append({"code": "product_not_found", "message": "Produkt ikke fundet/matchet"}) + + total_price = _to_decimal(line.get("total_price"), default=_to_decimal(line.get("sales_price"), Decimal("0"))) + if total_price < 0: + errors.append({"code": "negative_price", "message": "Negativ pris fundet"}) + if total_price == 0: + errors.append({"code": "zero_price", "message": "Pris er 0"}) + + if not line.get("billing_start"): + errors.append({"code": "missing_period", "message": "Manglende billing_start/periode"}) + + currency = _normalized_text(line.get("currency")) + if not currency: + errors.append({"code": "missing_currency", "message": "Valuta mangler"}) + + if int(line.get("id") or 0) in duplicate_ids: + errors.append({"code": "duplicate_line", "message": "Dublet-linje fundet i samme import"}) + + if line.get("matched_customer_id") is None and _normalized_text(line.get("also_company_id")): + has_company_mapping = execute_query_single( + "SELECT id FROM also_company_mapping WHERE also_company_id = %s AND is_active = true LIMIT 1", + (_normalized_text(line.get("also_company_id")),), + ) + if not has_company_mapping: + errors.append({"code": "missing_company_mapping", "message": "Manglende company mapping"}) + + if line.get("matched_product_id") is None and _normalized_text(line.get("material_number")) and _normalized_text(line.get("vendor")): + has_product_mapping = execute_query_single( + """ + SELECT id FROM also_product_mapping + WHERE material_number = %s AND LOWER(vendor) = LOWER(%s) AND is_active = true + LIMIT 1 + """, + (_normalized_text(line.get("material_number")), _normalized_text(line.get("vendor"))), + ) + if not has_product_mapping: + errors.append({"code": "missing_product_mapping", "message": "Manglende product mapping"}) + + return errors + + def _fetch_process_lines(self, import_job_id: Optional[int], line_ids: Optional[List[int]], limit: int) -> List[Dict[str, Any]]: + params: List[Any] = [] + where: List[str] = ["queue_status <> 'invoiced'"] + + if import_job_id: + where.append("import_job_id = %s") + params.append(import_job_id) + + if line_ids: + placeholders = ",".join(["%s"] * len(line_ids)) + where.append(f"id IN ({placeholders})") + params.extend(line_ids) + + params.append(max(1, min(limit, 5000))) + + return execute_query( + f""" + SELECT * + FROM also_import_lines + WHERE {' AND '.join(where)} + ORDER BY id ASC + LIMIT %s + """, + tuple(params), + ) or [] + + def create_import_job(self, payload: AlsoImportJobCreate, imported_by_user_id: Optional[int]) -> Dict[str, Any]: + self._assert_enabled() + rows = execute_query( + """ + INSERT INTO also_import_jobs ( + source_type, + source_label, + status, + file_name, + import_version, + imported_by_user_id, + raw_payload_json, + log_json, + started_at, + imported_at + ) VALUES (%s, %s, 'new', %s, %s, %s, %s::jsonb, '[]'::jsonb, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) + RETURNING * + """, + ( + payload.source_type, + payload.source_label, + payload.file_name, + payload.import_version, + imported_by_user_id, + _json_dumps(payload.raw_payload), + ), + ) + return rows[0] + + def list_import_jobs(self, status: Optional[str], limit: int) -> List[Dict[str, Any]]: + self._assert_enabled() + if status: + return execute_query( + """ + SELECT + j.*, + COALESCE(l.line_count, 0) AS line_count + FROM also_import_jobs j + LEFT JOIN ( + SELECT import_job_id, COUNT(*) AS line_count + FROM also_import_lines + GROUP BY import_job_id + ) l ON l.import_job_id = j.id + WHERE j.status = %s + ORDER BY j.imported_at DESC, j.id DESC + LIMIT %s + """, + (status, max(1, min(limit, 500))), + ) or [] + + return execute_query( + """ + SELECT + j.*, + COALESCE(l.line_count, 0) AS line_count + FROM also_import_jobs j + LEFT JOIN ( + SELECT import_job_id, COUNT(*) AS line_count + FROM also_import_lines + GROUP BY import_job_id + ) l ON l.import_job_id = j.id + ORDER BY j.imported_at DESC, j.id DESC + LIMIT %s + """, + (max(1, min(limit, 500)),), + ) or [] + + def get_import_job(self, job_id: int) -> Dict[str, Any]: + self._assert_enabled() + row = execute_query_single( + """ + SELECT + j.*, + COALESCE(l.line_count, 0) AS line_count + FROM also_import_jobs j + LEFT JOIN ( + SELECT import_job_id, COUNT(*) AS line_count + FROM also_import_lines + WHERE import_job_id = %s + GROUP BY import_job_id + ) l ON l.import_job_id = j.id + WHERE j.id = %s + """, + (job_id, job_id), + ) + if not row: + raise HTTPException(status_code=404, detail="Import job not found") + return row + + def import_lines(self, job_id: int, payload: AlsoImportLinesRequest) -> Dict[str, Any]: + self._assert_enabled() + job = execute_query_single("SELECT id FROM also_import_jobs WHERE id = %s", (job_id,)) + if not job: + raise HTTPException(status_code=404, detail="Import job not found") + + inserted = 0 + duplicates = 0 + + for idx, line in enumerate(payload.lines, start=1): + line_data = line.model_dump() + line_no = line_data.get("line_no") or idx + hash_value = _line_hash(job_id, line_data) + + existing = execute_query_single( + "SELECT id FROM also_import_lines WHERE import_job_id = %s AND line_hash = %s", + (job_id, hash_value), + ) + if existing: + duplicates += 1 + continue + + execute_query( + """ + INSERT INTO also_import_lines ( + import_job_id, + line_no, + queue_status, + source_line_ref, + line_hash, + also_company_id, + company, + customer_id, + account_id, + vat, + material_number, + product_name, + vendor, + cost_amount, + sales_price, + unit_price, + total_price, + currency, + billing_start, + charge_interval, + billing_interval, + billable_parameters, + raw_line_json, + validation_errors_json + ) VALUES ( + %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, + %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, + %s, %s, %s::jsonb, '[]'::jsonb + ) + """, + ( + job_id, + line_no, + line_data.get("queue_status") or "new", + line_data.get("source_line_ref"), + hash_value, + line_data.get("also_company_id"), + line_data.get("company"), + line_data.get("customer_id"), + line_data.get("account_id"), + line_data.get("vat"), + line_data.get("material_number"), + line_data.get("product_name"), + line_data.get("vendor"), + line_data.get("cost_amount"), + line_data.get("sales_price"), + line_data.get("unit_price"), + line_data.get("total_price"), + line_data.get("currency"), + line_data.get("billing_start"), + line_data.get("charge_interval"), + line_data.get("billing_interval"), + line_data.get("billable_parameters"), + _json_dumps(line_data.get("raw_line") or {}), + ), + ) + inserted += 1 + + execute_query( + """ + UPDATE also_import_jobs + SET status = CASE WHEN %s > 0 THEN 'lines_imported' ELSE status END, + finished_at = CURRENT_TIMESTAMP, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + """, + (inserted, job_id), + ) + + return { + "job_id": job_id, + "received": len(payload.lines), + "inserted": inserted, + "duplicates": duplicates, + } + + def get_queue(self, status: Optional[str], limit: int) -> List[Dict[str, Any]]: + self._assert_enabled() + if status: + return execute_query( + """ + SELECT * + FROM also_import_lines + WHERE queue_status = %s + ORDER BY id DESC + LIMIT %s + """, + (status, max(1, min(limit, 1000))), + ) or [] + + return execute_query( + """ + SELECT * + FROM also_import_lines + ORDER BY id DESC + LIMIT %s + """, + (max(1, min(limit, 1000)),), + ) or [] + + def run_matching(self, import_job_id: Optional[int], line_ids: List[int], limit: int) -> Dict[str, Any]: + self._assert_enabled() + lines = self._fetch_process_lines(import_job_id=import_job_id, line_ids=line_ids, limit=limit) + + updated = 0 + ready = 0 + errored = 0 + + for line in lines: + matched_customer_id = self._resolve_customer_match(line) + matched_product_id = self._resolve_product_match(line) + + current_errors = line.get("validation_errors_json") or [] + has_errors = bool(current_errors) + new_status = self._derive_queue_status(matched_customer_id, matched_product_id, has_errors) + + execute_query( + """ + UPDATE also_import_lines + SET matched_customer_id = %s, + matched_product_id = %s, + queue_status = %s, + matching_checked_at = CURRENT_TIMESTAMP, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + """, + (matched_customer_id, matched_product_id, new_status, line["id"]), + ) + updated += 1 + if new_status == "ready_for_approval": + ready += 1 + if new_status == "error": + errored += 1 + + return { + "processed": len(lines), + "updated": updated, + "ready_for_approval": ready, + "errored": errored, + } + + def run_validation(self, import_job_id: Optional[int], line_ids: List[int], limit: int) -> Dict[str, Any]: + self._assert_enabled() + lines = self._fetch_process_lines(import_job_id=import_job_id, line_ids=line_ids, limit=limit) + + duplicate_rows = execute_query( + """ + SELECT id + FROM ( + SELECT + id, + COUNT(*) OVER ( + PARTITION BY import_job_id, COALESCE(company, ''), COALESCE(material_number, ''), COALESCE(vendor, ''), COALESCE(billing_start::text, ''), COALESCE(total_price::text, '') + ) AS dup_count + FROM also_import_lines + WHERE queue_status <> 'invoiced' + AND (%s::INTEGER IS NULL OR import_job_id = %s) + ) q + WHERE q.dup_count > 1 + """, + (import_job_id, import_job_id), + ) or [] + duplicate_ids = {int(row["id"]) for row in duplicate_rows} + + updated = 0 + ready = 0 + errored = 0 + + for line in lines: + errors = self._build_validation_errors(line, duplicate_ids=duplicate_ids) + new_status = self._derive_queue_status(line.get("matched_customer_id"), line.get("matched_product_id"), bool(errors)) + + execute_query( + """ + UPDATE also_import_lines + SET validation_errors_json = %s::jsonb, + queue_status = %s, + validation_checked_at = CURRENT_TIMESTAMP, + updated_at = CURRENT_TIMESTAMP + WHERE id = %s + """, + (_json_dumps(errors), new_status, line["id"]), + ) + updated += 1 + if new_status == "ready_for_approval": + ready += 1 + if new_status == "error": + errored += 1 + + return { + "processed": len(lines), + "updated": updated, + "ready_for_approval": ready, + "errored": errored, + } + + def approve_lines_to_drafts(self, import_job_id: Optional[int], line_ids: List[int], approved_by_user_id: Optional[int]) -> Dict[str, Any]: + self._assert_enabled() + + params: List[Any] = [] + where = ["l.queue_status = 'ready_for_approval'", "l.matched_customer_id IS NOT NULL", "l.matched_product_id IS NOT NULL"] + + if import_job_id: + where.append("l.import_job_id = %s") + params.append(import_job_id) + + if line_ids: + placeholders = ",".join(["%s"] * len(line_ids)) + where.append(f"l.id IN ({placeholders})") + params.extend(line_ids) + + lines = execute_query( + f""" + SELECT + l.*, + c.name AS matched_customer_name, + p.name AS matched_product_name + FROM also_import_lines l + LEFT JOIN customers c ON c.id = l.matched_customer_id + LEFT JOIN products p ON p.id = l.matched_product_id + WHERE {' AND '.join(where)} + ORDER BY l.matched_customer_id, l.currency, COALESCE(l.billing_start, CURRENT_DATE), l.id + """, + tuple(params), + ) or [] + + if not lines: + raise HTTPException(status_code=400, detail="No ready-for-approval lines found") + + grouped: Dict[str, List[Dict[str, Any]]] = {} + for line in lines: + period_key = str(line.get("billing_start") or datetime.utcnow().date())[:7] + key = f"{line.get('matched_customer_id')}|{_normalized_text(line.get('currency')) or 'DKK'}|{period_key}" + grouped.setdefault(key, []).append(line) + + draft_ids: List[int] = [] + approved_lines = 0 + + for group_key, group_lines in grouped.items(): + first = group_lines[0] + customer_id = int(first["matched_customer_id"]) + customer_name = first.get("matched_customer_name") or f"Kunde {customer_id}" + currency = _normalized_text(first.get("currency")) or "DKK" + period_key = str(first.get("billing_start") or datetime.utcnow().date())[:7] + + draft_lines: List[Dict[str, Any]] = [] + for line in group_lines: + quantity = _to_decimal(line.get("billable_parameters"), Decimal("1")) + if quantity <= 0: + quantity = Decimal("1") + unit_price = _to_decimal(line.get("unit_price"), _to_decimal(line.get("sales_price"), Decimal("0"))) + amount = _to_decimal(line.get("total_price"), default=(quantity * unit_price)) + + draft_lines.append( + { + "line_key": f"also:{line['id']}", + "source_type": "also_cloud", + "source_id": int(line["id"]), + "reference_id": int(line["import_job_id"]), + "description": line.get("product_name") or line.get("matched_product_name") or "Cloud abonnement", + "quantity": float(quantity), + "unit": "stk", + "unit_price": float(unit_price), + "discount_percentage": 0.0, + "amount": float(amount), + "currency": currency, + "status": "approved", + "line_date": str(line.get("billing_start")) if line.get("billing_start") else None, + "product_id": int(line["matched_product_id"]), + "customer_id": customer_id, + "customer_name": customer_name, + "selected": True, + "meta": { + "also_material_number": line.get("material_number"), + "also_vendor": line.get("vendor"), + "also_import_job_id": int(line.get("import_job_id")), + }, + } + ) + + draft = execute_query_single( + """ + INSERT INTO ordre_drafts ( + title, + customer_id, + lines_json, + notes, + layout_number, + created_by_user_id, + sync_status, + export_status_json, + invoice_aggregate_key, + updated_at + ) VALUES (%s, %s, %s::jsonb, %s, %s, %s, 'pending', %s::jsonb, %s, CURRENT_TIMESTAMP) + RETURNING id + """, + ( + f"ALSO Cloud {customer_name} - {period_key}", + customer_id, + _json_dumps(draft_lines), + "Genereret fra ALSO Cloud Billing approval", + 1, + approved_by_user_id, + _json_dumps({"source": "also_cloud_billing"}), + f"also-cloud-{customer_id}-{period_key}", + ), + ) + + draft_id = int(draft["id"]) if draft and draft.get("id") else None + if not draft_id: + raise HTTPException(status_code=500, detail="Failed creating ordre draft from ALSO approval") + + draft_ids.append(draft_id) + + line_id_values = [int(line["id"]) for line in group_lines] + placeholders = ",".join(["%s"] * len(line_id_values)) + execute_query( + f""" + UPDATE also_import_lines + SET queue_status = 'approved', + approved_at = CURRENT_TIMESTAMP, + approved_by_user_id = %s, + order_draft_id = %s, + updated_at = CURRENT_TIMESTAMP + WHERE id IN ({placeholders}) + """, + tuple([approved_by_user_id, draft_id] + line_id_values), + ) + approved_lines += len(group_lines) + + return { + "approved_lines": approved_lines, + "created_drafts": len(draft_ids), + "draft_ids": draft_ids, + } + + def get_dashboard_summary(self) -> Dict[str, Any]: + self._assert_enabled() + row = execute_query_single( + """ + WITH month_lines AS ( + SELECT * + FROM also_import_lines + WHERE date_trunc('month', COALESCE(billing_start::timestamp, created_at)) = date_trunc('month', CURRENT_DATE) + ) + SELECT + COALESCE(SUM(COALESCE(total_price, sales_price, 0)), 0) AS monthly_revenue, + COALESCE(SUM(COALESCE(cost_amount, 0)), 0) AS monthly_cost, + COALESCE(SUM(COALESCE(total_price, sales_price, 0) - COALESCE(cost_amount, 0)), 0) AS monthly_margin, + COUNT(*) FILTER (WHERE matched_product_id IS NULL) AS unmatched_products, + COUNT(*) FILTER (WHERE matched_customer_id IS NULL) AS unmatched_customers, + COUNT(*) FILTER (WHERE queue_status = 'ready_for_approval') AS pending_approvals, + COUNT(DISTINCT matched_customer_id) FILTER (WHERE queue_status = 'invoiced' AND matched_customer_id IS NOT NULL) AS invoiced_customers + FROM month_lines + """, + (), + ) or {} + + return { + "monthly_revenue": row.get("monthly_revenue") or Decimal("0"), + "monthly_cost": row.get("monthly_cost") or Decimal("0"), + "monthly_margin": row.get("monthly_margin") or Decimal("0"), + "unmatched_products": int(row.get("unmatched_products") or 0), + "unmatched_customers": int(row.get("unmatched_customers") or 0), + "pending_approvals": int(row.get("pending_approvals") or 0), + "invoiced_customers": int(row.get("invoiced_customers") or 0), + } + + def get_monthly_differences(self, limit: int = 50) -> List[Dict[str, Any]]: + self._assert_enabled() + rows = execute_query( + """ + WITH current_month AS ( + SELECT + matched_customer_id, + material_number, + vendor, + product_name, + SUM(COALESCE(billable_parameters, 1)) AS qty + FROM also_import_lines + WHERE date_trunc('month', COALESCE(billing_start::timestamp, created_at)) = date_trunc('month', CURRENT_DATE) + GROUP BY matched_customer_id, material_number, vendor, product_name + ), + previous_month AS ( + SELECT + matched_customer_id, + material_number, + vendor, + product_name, + SUM(COALESCE(billable_parameters, 1)) AS qty + FROM also_import_lines + WHERE date_trunc('month', COALESCE(billing_start::timestamp, created_at)) = date_trunc('month', CURRENT_DATE - INTERVAL '1 month') + GROUP BY matched_customer_id, material_number, vendor, product_name + ), + merged AS ( + SELECT + COALESCE(c.matched_customer_id, p.matched_customer_id) AS customer_id, + COALESCE(c.material_number, p.material_number) AS material_number, + COALESCE(c.vendor, p.vendor) AS vendor, + COALESCE(c.product_name, p.product_name) AS product_name, + COALESCE(p.qty, 0) AS previous_month_qty, + COALESCE(c.qty, 0) AS current_month_qty + FROM current_month c + FULL OUTER JOIN previous_month p + ON COALESCE(c.matched_customer_id, 0) = COALESCE(p.matched_customer_id, 0) + AND COALESCE(c.material_number, '') = COALESCE(p.material_number, '') + AND COALESCE(c.vendor, '') = COALESCE(p.vendor, '') + AND COALESCE(c.product_name, '') = COALESCE(p.product_name, '') + ) + SELECT + m.*, + cu.name AS customer_name, + CASE + WHEN m.previous_month_qty = 0 THEN NULL + ELSE ROUND(((m.current_month_qty - m.previous_month_qty) / NULLIF(m.previous_month_qty, 0)) * 100, 2) + END AS change_percent + FROM merged m + LEFT JOIN customers cu ON cu.id = m.customer_id + WHERE m.previous_month_qty <> m.current_month_qty + ORDER BY ABS(COALESCE( + CASE + WHEN m.previous_month_qty = 0 THEN NULL + ELSE ((m.current_month_qty - m.previous_month_qty) / NULLIF(m.previous_month_qty, 0)) * 100 + END, + 0 + )) DESC, m.current_month_qty DESC + LIMIT %s + """, + (max(1, min(limit, 200)),), + ) or [] + + results: List[Dict[str, Any]] = [] + for row in rows: + change_percent = row.get("change_percent") + warning = False + if change_percent is not None: + try: + warning = abs(Decimal(str(change_percent))) >= Decimal("50") + except Exception: + warning = False + + results.append( + { + "customer_id": row.get("customer_id"), + "customer_name": row.get("customer_name"), + "material_number": row.get("material_number"), + "product_name": row.get("product_name"), + "vendor": row.get("vendor"), + "previous_month_qty": row.get("previous_month_qty") or Decimal("0"), + "current_month_qty": row.get("current_month_qty") or Decimal("0"), + "change_percent": change_percent, + "warning": warning, + } + ) + + return results + + def upsert_company_mapping(self, payload: AlsoCompanyMappingUpsert) -> Dict[str, Any]: + self._assert_enabled() + rows = execute_query( + """ + INSERT INTO also_company_mapping ( + also_company_id, + also_customer_id, + customer_id, + match_confidence, + notes, + is_active + ) VALUES (%s, %s, %s, %s, %s, true) + ON CONFLICT (also_company_id) + DO UPDATE SET + also_customer_id = EXCLUDED.also_customer_id, + customer_id = EXCLUDED.customer_id, + match_confidence = EXCLUDED.match_confidence, + notes = EXCLUDED.notes, + is_active = true, + updated_at = CURRENT_TIMESTAMP + RETURNING * + """, + ( + payload.also_company_id, + payload.also_customer_id, + payload.customer_id, + payload.match_confidence, + payload.notes, + ), + ) + return rows[0] + + def upsert_product_mapping(self, payload: AlsoProductMappingUpsert) -> Dict[str, Any]: + self._assert_enabled() + rows = execute_query( + """ + INSERT INTO also_product_mapping ( + material_number, + vendor, + hub_product_id, + product_name_snapshot, + is_active + ) VALUES (%s, %s, %s, %s, true) + ON CONFLICT (material_number, vendor) + DO UPDATE SET + hub_product_id = EXCLUDED.hub_product_id, + product_name_snapshot = EXCLUDED.product_name_snapshot, + is_active = true, + updated_at = CURRENT_TIMESTAMP + RETURNING * + """, + ( + payload.material_number, + payload.vendor, + payload.hub_product_id, + payload.product_name_snapshot, + ), + ) + return rows[0] + + +also_service = AlsoService() diff --git a/app/modules/also/models/__init__.py b/app/modules/also/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/modules/also/models/schemas.py b/app/modules/also/models/schemas.py new file mode 100644 index 0000000..09d0fcd --- /dev/null +++ b/app/modules/also/models/schemas.py @@ -0,0 +1,148 @@ +from datetime import date, datetime +from decimal import Decimal +from typing import Any, Dict, List, Literal, Optional + +from pydantic import BaseModel, Field + + +ALSO_SOURCE_TYPES = Literal["api", "xml", "json_export", "xml_export", "csv"] +ALSO_QUEUE_STATUSES = Literal[ + "new", + "matching_products", + "matching_customers", + "ready_for_approval", + "approved", + "invoiced", + "error", +] + + +class AlsoImportJobCreate(BaseModel): + source_type: ALSO_SOURCE_TYPES + source_label: Optional[str] = None + file_name: Optional[str] = None + import_version: Optional[str] = None + raw_payload: Dict[str, Any] = Field(default_factory=dict) + + +class AlsoImportLineInput(BaseModel): + line_no: Optional[int] = None + source_line_ref: Optional[str] = None + + company: Optional[str] = None + customer_id: Optional[str] = None + account_id: Optional[str] = None + vat: Optional[str] = None + also_company_id: Optional[str] = None + + material_number: Optional[str] = None + product_name: Optional[str] = None + vendor: Optional[str] = None + + cost_amount: Optional[Decimal] = None + sales_price: Optional[Decimal] = None + unit_price: Optional[Decimal] = None + total_price: Optional[Decimal] = None + currency: Optional[str] = None + + billing_start: Optional[date] = None + charge_interval: Optional[str] = None + billing_interval: Optional[str] = None + + billable_parameters: Optional[Decimal] = None + queue_status: ALSO_QUEUE_STATUSES = "new" + raw_line: Dict[str, Any] = Field(default_factory=dict) + + +class AlsoImportLinesRequest(BaseModel): + lines: List[AlsoImportLineInput] = Field(default_factory=list) + + +class AlsoQueueProcessRequest(BaseModel): + import_job_id: Optional[int] = Field(default=None, gt=0) + line_ids: List[int] = Field(default_factory=list) + limit: int = Field(default=500, ge=1, le=5000) + + +class AlsoQueueApproveRequest(BaseModel): + import_job_id: Optional[int] = Field(default=None, gt=0) + line_ids: List[int] = Field(default_factory=list) + + +class AlsoQueueProcessResult(BaseModel): + processed: int + updated: int + ready_for_approval: int + errored: int + + +class AlsoApproveResult(BaseModel): + approved_lines: int + created_drafts: int + draft_ids: List[int] = Field(default_factory=list) + + +class AlsoCompanyMappingUpsert(BaseModel): + also_company_id: str = Field(min_length=1) + also_customer_id: Optional[str] = None + customer_id: int = Field(gt=0) + match_confidence: Optional[Decimal] = None + notes: Optional[str] = None + + +class AlsoProductMappingUpsert(BaseModel): + material_number: str = Field(min_length=1) + vendor: str = Field(min_length=1) + hub_product_id: int = Field(gt=0) + product_name_snapshot: Optional[str] = None + + +class AlsoImportJobResponse(BaseModel): + id: int + source_type: str + source_label: Optional[str] = None + status: str + file_name: Optional[str] = None + import_version: Optional[str] = None + imported_by_user_id: Optional[int] = None + imported_at: datetime + line_count: int = 0 + + +class AlsoQueueLineResponse(BaseModel): + id: int + import_job_id: int + queue_status: str + company: Optional[str] = None + customer_id: Optional[str] = None + material_number: Optional[str] = None + product_name: Optional[str] = None + vendor: Optional[str] = None + total_price: Optional[Decimal] = None + currency: Optional[str] = None + matched_customer_id: Optional[int] = None + matched_product_id: Optional[int] = None + order_draft_id: Optional[int] = None + validation_errors_json: List[Dict[str, Any]] = Field(default_factory=list) + + +class AlsoDashboardSummaryResponse(BaseModel): + monthly_revenue: Decimal + monthly_cost: Decimal + monthly_margin: Decimal + unmatched_products: int + unmatched_customers: int + pending_approvals: int + invoiced_customers: int + + +class AlsoDifferenceItem(BaseModel): + customer_id: Optional[int] = None + customer_name: Optional[str] = None + material_number: Optional[str] = None + product_name: Optional[str] = None + vendor: Optional[str] = None + previous_month_qty: Decimal + current_month_qty: Decimal + change_percent: Optional[Decimal] = None + warning: bool = False diff --git a/app/modules/sag/frontend/views.py b/app/modules/sag/frontend/views.py index 80f9123..f86b0f3 100644 --- a/app/modules/sag/frontend/views.py +++ b/app/modules/sag/frontend/views.py @@ -230,13 +230,14 @@ async def sager_liste( LEFT JOIN users u ON u.user_id = s.ansvarlig_bruger_id LEFT JOIN groups g ON g.id = s.assigned_group_id LEFT JOIN LATERAL ( - SELECT cc.contact_id - FROM contact_companies cc - WHERE cc.customer_id = c.id - ORDER BY cc.is_primary DESC NULLS LAST, cc.id ASC + SELECT sk.contact_id + FROM sag_kontakter sk + WHERE sk.sag_id = s.id + AND sk.deleted_at IS NULL + ORDER BY sk.is_primary DESC NULLS LAST, sk.id ASC LIMIT 1 - ) cc_first ON true - LEFT JOIN contacts cont ON cc_first.contact_id = cont.id + ) sk_first ON true + LEFT JOIN contacts cont ON sk_first.contact_id = cont.id LEFT JOIN LATERAL ( SELECT t.title, t.due_date FROM sag_todo_steps t diff --git a/.env.bak b/keepforlater/.env.bak similarity index 100% rename from .env.bak rename to keepforlater/.env.bak diff --git a/.env.bak2 b/keepforlater/.env.bak2 similarity index 100% rename from .env.bak2 rename to keepforlater/.env.bak2 diff --git a/design_forslag_1_sidebar.html b/keepforlater/design_forslag_1_sidebar.html similarity index 100% rename from design_forslag_1_sidebar.html rename to keepforlater/design_forslag_1_sidebar.html diff --git a/design_forslag_2_kompakt.html b/keepforlater/design_forslag_2_kompakt.html similarity index 100% rename from design_forslag_2_kompakt.html rename to keepforlater/design_forslag_2_kompakt.html diff --git a/design_forslag_3_kort.html b/keepforlater/design_forslag_3_kort.html similarity index 100% rename from design_forslag_3_kort.html rename to keepforlater/design_forslag_3_kort.html diff --git a/docker-compose.yml.bak2 b/keepforlater/docker-compose.yml.bak2 similarity index 100% rename from docker-compose.yml.bak2 rename to keepforlater/docker-compose.yml.bak2 diff --git a/docker-compose.yml.bak3 b/keepforlater/docker-compose.yml.bak3 similarity index 100% rename from docker-compose.yml.bak3 rename to keepforlater/docker-compose.yml.bak3 diff --git a/fix_cols.py b/keepforlater/fix_cols.py similarity index 100% rename from fix_cols.py rename to keepforlater/fix_cols.py diff --git a/fix_desc2.py b/keepforlater/fix_desc2.py similarity index 100% rename from fix_desc2.py rename to keepforlater/fix_desc2.py diff --git a/fix_domcontent.py b/keepforlater/fix_domcontent.py similarity index 100% rename from fix_domcontent.py rename to keepforlater/fix_domcontent.py diff --git a/fix_getTimeV1EmployeeId.py b/keepforlater/fix_getTimeV1EmployeeId.py similarity index 100% rename from fix_getTimeV1EmployeeId.py rename to keepforlater/fix_getTimeV1EmployeeId.py diff --git a/fix_hero_desc.py b/keepforlater/fix_hero_desc.py similarity index 100% rename from fix_hero_desc.py rename to keepforlater/fix_hero_desc.py diff --git a/fix_hide_logic2.py b/keepforlater/fix_hide_logic2.py similarity index 100% rename from fix_hide_logic2.py rename to keepforlater/fix_hide_logic2.py diff --git a/keepforlater/fix_js2.py b/keepforlater/fix_js2.py new file mode 100644 index 0000000..e69de29 diff --git a/fix_relations_center.py b/keepforlater/fix_relations_center.py similarity index 100% rename from fix_relations_center.py rename to keepforlater/fix_relations_center.py diff --git a/fix_tab.py b/keepforlater/fix_tab.py similarity index 100% rename from fix_tab.py rename to keepforlater/fix_tab.py diff --git a/fix_telefoni_per_krag_numbers.sql b/keepforlater/fix_telefoni_per_krag_numbers.sql similarity index 100% rename from fix_telefoni_per_krag_numbers.sql rename to keepforlater/fix_telefoni_per_krag_numbers.sql diff --git a/fix_time_modal.py b/keepforlater/fix_time_modal.py similarity index 100% rename from fix_time_modal.py rename to keepforlater/fix_time_modal.py diff --git a/fix_timeline_clean.py b/keepforlater/fix_timeline_clean.py similarity index 100% rename from fix_timeline_clean.py rename to keepforlater/fix_timeline_clean.py diff --git a/fix_timeline_colors.py b/keepforlater/fix_timeline_colors.py similarity index 100% rename from fix_timeline_colors.py rename to keepforlater/fix_timeline_colors.py diff --git a/fix_top.py b/keepforlater/fix_top.py similarity index 100% rename from fix_top.py rename to keepforlater/fix_top.py diff --git a/forslag_kommentar.html b/keepforlater/forslag_kommentar.html similarity index 100% rename from forslag_kommentar.html rename to keepforlater/forslag_kommentar.html diff --git a/get_js.py b/keepforlater/get_js.py similarity index 100% rename from get_js.py rename to keepforlater/get_js.py diff --git a/get_saveTime.py b/keepforlater/get_saveTime.py similarity index 100% rename from get_saveTime.py rename to keepforlater/get_saveTime.py diff --git a/mine_3_anbefalinger.html b/keepforlater/mine_3_anbefalinger.html similarity index 100% rename from mine_3_anbefalinger.html rename to keepforlater/mine_3_anbefalinger.html diff --git a/old_js.txt b/keepforlater/old_js.txt similarity index 100% rename from old_js.txt rename to keepforlater/old_js.txt diff --git a/opgavebeskrivelse_mockup_3_forsog.html b/keepforlater/opgavebeskrivelse_mockup_3_forsog.html similarity index 100% rename from opgavebeskrivelse_mockup_3_forsog.html rename to keepforlater/opgavebeskrivelse_mockup_3_forsog.html diff --git a/parse_html.py b/keepforlater/parse_html.py similarity index 100% rename from parse_html.py rename to keepforlater/parse_html.py diff --git a/parse_test.py b/keepforlater/parse_test.py similarity index 100% rename from parse_test.py rename to keepforlater/parse_test.py diff --git a/patch_backend_router.py b/keepforlater/patch_backend_router.py similarity index 100% rename from patch_backend_router.py rename to keepforlater/patch_backend_router.py diff --git a/patch_base.py b/keepforlater/patch_base.py similarity index 100% rename from patch_base.py rename to keepforlater/patch_base.py diff --git a/patch_base_html.py b/keepforlater/patch_base_html.py similarity index 100% rename from patch_base_html.py rename to keepforlater/patch_base_html.py diff --git a/patch_bb_chat.py b/keepforlater/patch_bb_chat.py similarity index 100% rename from patch_bb_chat.py rename to keepforlater/patch_bb_chat.py diff --git a/patch_bb_chat2.py b/keepforlater/patch_bb_chat2.py similarity index 100% rename from patch_bb_chat2.py rename to keepforlater/patch_bb_chat2.py diff --git a/patch_bb_chat3.py b/keepforlater/patch_bb_chat3.py similarity index 100% rename from patch_bb_chat3.py rename to keepforlater/patch_bb_chat3.py diff --git a/patch_bb_ver2.py b/keepforlater/patch_bb_ver2.py similarity index 100% rename from patch_bb_ver2.py rename to keepforlater/patch_bb_ver2.py diff --git a/patch_bottombar_router.py b/keepforlater/patch_bottombar_router.py similarity index 100% rename from patch_bottombar_router.py rename to keepforlater/patch_bottombar_router.py diff --git a/patch_chip_filter.py b/keepforlater/patch_chip_filter.py similarity index 100% rename from patch_chip_filter.py rename to keepforlater/patch_chip_filter.py diff --git a/patch_detail.py b/keepforlater/patch_detail.py similarity index 100% rename from patch_detail.py rename to keepforlater/patch_detail.py diff --git a/patch_everything.py b/keepforlater/patch_everything.py similarity index 100% rename from patch_everything.py rename to keepforlater/patch_everything.py diff --git a/patch_frontend.py b/keepforlater/patch_frontend.py similarity index 100% rename from patch_frontend.py rename to keepforlater/patch_frontend.py diff --git a/patch_frontend_cache.py b/keepforlater/patch_frontend_cache.py similarity index 100% rename from patch_frontend_cache.py rename to keepforlater/patch_frontend_cache.py diff --git a/patch_hw_help.py b/keepforlater/patch_hw_help.py similarity index 100% rename from patch_hw_help.py rename to keepforlater/patch_hw_help.py diff --git a/patch_js_events.py b/keepforlater/patch_js_events.py similarity index 100% rename from patch_js_events.py rename to keepforlater/patch_js_events.py diff --git a/patch_js_events2.py b/keepforlater/patch_js_events2.py similarity index 100% rename from patch_js_events2.py rename to keepforlater/patch_js_events2.py diff --git a/patch_js_icons.py b/keepforlater/patch_js_icons.py similarity index 100% rename from patch_js_icons.py rename to keepforlater/patch_js_icons.py diff --git a/patch_js_rich_ui.py b/keepforlater/patch_js_rich_ui.py similarity index 100% rename from patch_js_rich_ui.py rename to keepforlater/patch_js_rich_ui.py diff --git a/patch_lækker.py b/keepforlater/patch_lækker.py similarity index 100% rename from patch_lækker.py rename to keepforlater/patch_lækker.py diff --git a/patch_mail_help.py b/keepforlater/patch_mail_help.py similarity index 100% rename from patch_mail_help.py rename to keepforlater/patch_mail_help.py diff --git a/patch_manual_backend.py b/keepforlater/patch_manual_backend.py similarity index 100% rename from patch_manual_backend.py rename to keepforlater/patch_manual_backend.py diff --git a/patch_next_task.py b/keepforlater/patch_next_task.py similarity index 100% rename from patch_next_task.py rename to keepforlater/patch_next_task.py diff --git a/patch_overview_logic.py b/keepforlater/patch_overview_logic.py similarity index 100% rename from patch_overview_logic.py rename to keepforlater/patch_overview_logic.py diff --git a/patch_sag_help.py b/keepforlater/patch_sag_help.py similarity index 100% rename from patch_sag_help.py rename to keepforlater/patch_sag_help.py diff --git a/patch_time_form.py b/keepforlater/patch_time_form.py similarity index 100% rename from patch_time_form.py rename to keepforlater/patch_time_form.py diff --git a/patch_time_modal.py b/keepforlater/patch_time_modal.py similarity index 100% rename from patch_time_modal.py rename to keepforlater/patch_time_modal.py diff --git a/patch_urls.py b/keepforlater/patch_urls.py similarity index 100% rename from patch_urls.py rename to keepforlater/patch_urls.py diff --git a/patch_views_fastapi.py b/keepforlater/patch_views_fastapi.py similarity index 100% rename from patch_views_fastapi.py rename to keepforlater/patch_views_fastapi.py diff --git a/print_saveTime.py b/keepforlater/print_saveTime.py similarity index 100% rename from print_saveTime.py rename to keepforlater/print_saveTime.py diff --git a/refactor_detail.py b/keepforlater/refactor_detail.py similarity index 100% rename from refactor_detail.py rename to keepforlater/refactor_detail.py diff --git a/rewrite_bottom_bar.py b/keepforlater/rewrite_bottom_bar.py similarity index 100% rename from rewrite_bottom_bar.py rename to keepforlater/rewrite_bottom_bar.py diff --git a/rewrite_detail.py b/keepforlater/rewrite_detail.py similarity index 100% rename from rewrite_detail.py rename to keepforlater/rewrite_detail.py diff --git a/run_rewrite.py b/keepforlater/run_rewrite.py similarity index 100% rename from run_rewrite.py rename to keepforlater/run_rewrite.py diff --git a/test_ai_analyze.py b/keepforlater/test_ai_analyze.py similarity index 100% rename from test_ai_analyze.py rename to keepforlater/test_ai_analyze.py diff --git a/test_anydesk.py b/keepforlater/test_anydesk.py similarity index 100% rename from test_anydesk.py rename to keepforlater/test_anydesk.py diff --git a/test_billed_field.py b/keepforlater/test_billed_field.py similarity index 100% rename from test_billed_field.py rename to keepforlater/test_billed_field.py diff --git a/test_bulk_customer_update.py b/keepforlater/test_bulk_customer_update.py similarity index 100% rename from test_bulk_customer_update.py rename to keepforlater/test_bulk_customer_update.py diff --git a/test_contact_relation.py b/keepforlater/test_contact_relation.py similarity index 100% rename from test_contact_relation.py rename to keepforlater/test_contact_relation.py diff --git a/test_cvr_filter.py b/keepforlater/test_cvr_filter.py similarity index 100% rename from test_cvr_filter.py rename to keepforlater/test_cvr_filter.py diff --git a/test_location_module_qa.py b/keepforlater/test_location_module_qa.py similarity index 100% rename from test_location_module_qa.py rename to keepforlater/test_location_module_qa.py diff --git a/test_manual.py b/keepforlater/test_manual.py similarity index 100% rename from test_manual.py rename to keepforlater/test_manual.py diff --git a/test_quick_analysis.py b/keepforlater/test_quick_analysis.py similarity index 100% rename from test_quick_analysis.py rename to keepforlater/test_quick_analysis.py diff --git a/test_routes.py b/keepforlater/test_routes.py similarity index 100% rename from test_routes.py rename to keepforlater/test_routes.py diff --git a/test_sag_new_endpoints.sh b/keepforlater/test_sag_new_endpoints.sh similarity index 100% rename from test_sag_new_endpoints.sh rename to keepforlater/test_sag_new_endpoints.sh diff --git a/test_sag_query.py b/keepforlater/test_sag_query.py similarity index 100% rename from test_sag_query.py rename to keepforlater/test_sag_query.py diff --git a/test_service_contract_wizard.py b/keepforlater/test_service_contract_wizard.py similarity index 100% rename from test_service_contract_wizard.py rename to keepforlater/test_service_contract_wizard.py diff --git a/test_sftp.py b/keepforlater/test_sftp.py similarity index 100% rename from test_sftp.py rename to keepforlater/test_sftp.py diff --git a/test_subscription_processing.py b/keepforlater/test_subscription_processing.py similarity index 100% rename from test_subscription_processing.py rename to keepforlater/test_subscription_processing.py diff --git a/test_subscription_singular.py b/keepforlater/test_subscription_singular.py similarity index 100% rename from test_subscription_singular.py rename to keepforlater/test_subscription_singular.py diff --git a/test_subscriptions.py b/keepforlater/test_subscriptions.py similarity index 100% rename from test_subscriptions.py rename to keepforlater/test_subscriptions.py diff --git a/test_ticket_module.py b/keepforlater/test_ticket_module.py similarity index 100% rename from test_ticket_module.py rename to keepforlater/test_ticket_module.py diff --git a/test_vtiger_account.py b/keepforlater/test_vtiger_account.py similarity index 100% rename from test_vtiger_account.py rename to keepforlater/test_vtiger_account.py diff --git a/test_vtiger_accounts.py b/keepforlater/test_vtiger_accounts.py similarity index 100% rename from test_vtiger_accounts.py rename to keepforlater/test_vtiger_accounts.py diff --git a/test_vtiger_contact.py b/keepforlater/test_vtiger_contact.py similarity index 100% rename from test_vtiger_contact.py rename to keepforlater/test_vtiger_contact.py diff --git a/test_vtiger_fields.py b/keepforlater/test_vtiger_fields.py similarity index 100% rename from test_vtiger_fields.py rename to keepforlater/test_vtiger_fields.py diff --git a/test_vtiger_modules.py b/keepforlater/test_vtiger_modules.py similarity index 100% rename from test_vtiger_modules.py rename to keepforlater/test_vtiger_modules.py diff --git a/test_wrapper.py b/keepforlater/test_wrapper.py similarity index 100% rename from test_wrapper.py rename to keepforlater/test_wrapper.py diff --git a/test_wrapper2.py b/keepforlater/test_wrapper2.py similarity index 100% rename from test_wrapper2.py rename to keepforlater/test_wrapper2.py diff --git a/main.py b/main.py index ffdfcaa..d924f3f 100644 --- a/main.py +++ b/main.py @@ -135,6 +135,7 @@ from app.modules.orders.backend import router as orders_api from app.modules.orders.frontend import views as orders_views from app.modules.fedex.backend import router as fedex_api from app.modules.fedex.frontend import views as fedex_views +from app.modules.also.backend import router as also_api from app.modules.manual.backend import router as manual_api from app.modules.manual.frontend import views as manual_views from app.modules.bottom_bar.backend import router as bottom_bar_api @@ -457,6 +458,7 @@ app.include_router(telefoni_api.router, prefix="/api/v1", tags=["Telefoni"]) app.include_router(calendar_api.router, prefix="/api/v1", tags=["Calendar"]) app.include_router(orders_api.router, prefix="/api/v1", tags=["Orders"]) app.include_router(fedex_api.router, prefix="/api/v1", tags=["FedEx"]) +app.include_router(also_api.router, prefix="/api/v1", tags=["ALSO Cloud Billing"]) app.include_router(manual_api.router, prefix="/api/v1", tags=["Manual"]) app.include_router(bottom_bar_api.router, prefix="/api/v1/bottom-bar", tags=["Bottom Bar"]) app.include_router(bottom_bar_public_api.router, tags=["Bottom Bar Public"]) diff --git a/migrations/192_also_cloud_billing_foundation.sql b/migrations/192_also_cloud_billing_foundation.sql new file mode 100644 index 0000000..f3d8c39 --- /dev/null +++ b/migrations/192_also_cloud_billing_foundation.sql @@ -0,0 +1,108 @@ +-- ALSO Cloud Billing foundation +-- Import jobs, import lines queue, and mapping tables + +CREATE TABLE IF NOT EXISTS also_import_jobs ( + id SERIAL PRIMARY KEY, + source_type VARCHAR(32) NOT NULL CHECK (source_type IN ('api', 'xml', 'json_export', 'xml_export', 'csv')), + source_label VARCHAR(255), + status VARCHAR(32) NOT NULL DEFAULT 'new', + file_name VARCHAR(512), + import_version VARCHAR(128), + imported_by_user_id INTEGER REFERENCES users(user_id) ON DELETE SET NULL, + imported_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + started_at TIMESTAMP, + finished_at TIMESTAMP, + raw_payload_json JSONB NOT NULL DEFAULT '{}'::jsonb, + log_json JSONB NOT NULL DEFAULT '[]'::jsonb, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX IF NOT EXISTS idx_also_import_jobs_status ON also_import_jobs(status); +CREATE INDEX IF NOT EXISTS idx_also_import_jobs_imported_at ON also_import_jobs(imported_at DESC); + + +CREATE TABLE IF NOT EXISTS also_import_lines ( + id BIGSERIAL PRIMARY KEY, + import_job_id INTEGER NOT NULL REFERENCES also_import_jobs(id) ON DELETE CASCADE, + line_no INTEGER, + queue_status VARCHAR(32) NOT NULL DEFAULT 'new' CHECK (queue_status IN ( + 'new', + 'matching_products', + 'matching_customers', + 'ready_for_approval', + 'approved', + 'invoiced', + 'error' + )), + source_line_ref VARCHAR(255), + line_hash VARCHAR(128) NOT NULL, + + also_company_id VARCHAR(128), + company VARCHAR(255), + customer_id VARCHAR(128), + account_id VARCHAR(128), + vat VARCHAR(64), + + material_number VARCHAR(128), + product_name VARCHAR(512), + vendor VARCHAR(255), + + cost_amount NUMERIC(14, 4), + sales_price NUMERIC(14, 4), + unit_price NUMERIC(14, 4), + total_price NUMERIC(14, 4), + currency VARCHAR(16), + + billing_start DATE, + charge_interval VARCHAR(64), + billing_interval VARCHAR(64), + billable_parameters NUMERIC(14, 4), + + matched_customer_id INTEGER REFERENCES customers(id) ON DELETE SET NULL, + matched_product_id INTEGER REFERENCES products(id) ON DELETE SET NULL, + validation_errors_json JSONB NOT NULL DEFAULT '[]'::jsonb, + raw_line_json JSONB NOT NULL DEFAULT '{}'::jsonb, + + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + + CONSTRAINT uniq_also_import_line_hash UNIQUE (import_job_id, line_hash) +); + +CREATE INDEX IF NOT EXISTS idx_also_import_lines_job ON also_import_lines(import_job_id); +CREATE INDEX IF NOT EXISTS idx_also_import_lines_status ON also_import_lines(queue_status); +CREATE INDEX IF NOT EXISTS idx_also_import_lines_material_vendor ON also_import_lines(material_number, vendor); +CREATE INDEX IF NOT EXISTS idx_also_import_lines_customer_keys ON also_import_lines(also_company_id, customer_id, vat); +CREATE INDEX IF NOT EXISTS idx_also_import_lines_unmatched_customer ON also_import_lines(matched_customer_id) WHERE matched_customer_id IS NULL; +CREATE INDEX IF NOT EXISTS idx_also_import_lines_unmatched_product ON also_import_lines(matched_product_id) WHERE matched_product_id IS NULL; + + +CREATE TABLE IF NOT EXISTS also_company_mapping ( + id SERIAL PRIMARY KEY, + also_company_id VARCHAR(128) NOT NULL UNIQUE, + also_customer_id VARCHAR(128), + customer_id INTEGER NOT NULL REFERENCES customers(id) ON DELETE CASCADE, + match_confidence NUMERIC(5, 2), + notes TEXT, + is_active BOOLEAN NOT NULL DEFAULT true, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX IF NOT EXISTS idx_also_company_mapping_customer ON also_company_mapping(customer_id); + + +CREATE TABLE IF NOT EXISTS also_product_mapping ( + id SERIAL PRIMARY KEY, + material_number VARCHAR(128) NOT NULL, + vendor VARCHAR(255) NOT NULL, + hub_product_id INTEGER NOT NULL REFERENCES products(id) ON DELETE CASCADE, + product_name_snapshot VARCHAR(512), + is_active BOOLEAN NOT NULL DEFAULT true, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + CONSTRAINT uniq_also_product_mapping UNIQUE (material_number, vendor) +); + +CREATE INDEX IF NOT EXISTS idx_also_product_mapping_product ON also_product_mapping(hub_product_id); diff --git a/migrations/193_also_cloud_billing_workflow_columns.sql b/migrations/193_also_cloud_billing_workflow_columns.sql new file mode 100644 index 0000000..33a3025 --- /dev/null +++ b/migrations/193_also_cloud_billing_workflow_columns.sql @@ -0,0 +1,13 @@ +-- ALSO Cloud Billing workflow columns +-- Supports matching/validation timestamps and approval linkage to local order drafts. + +ALTER TABLE also_import_lines +ADD COLUMN IF NOT EXISTS matching_checked_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS validation_checked_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS approved_at TIMESTAMP, +ADD COLUMN IF NOT EXISTS approved_by_user_id INTEGER REFERENCES users(user_id) ON DELETE SET NULL, +ADD COLUMN IF NOT EXISTS order_draft_id INTEGER REFERENCES ordre_drafts(id) ON DELETE SET NULL, +ADD COLUMN IF NOT EXISTS invoiced_at TIMESTAMP; + +CREATE INDEX IF NOT EXISTS idx_also_import_lines_order_draft ON also_import_lines(order_draft_id); +CREATE INDEX IF NOT EXISTS idx_also_import_lines_approved_at ON also_import_lines(approved_at DESC);
    ${escapeHtml(displayName)}${title}${email}${phone}${mobile}${primaryBadge}
    ${escapeHtml(row.month || '-')}${formatDKK(Number(row.revenue_total || 0))}${formatDKK(Number(row.margin_total || 0))}
    Ingen mĂĄnedlige data
    ${escapeHtml(row.product_name || '-')}${escapeHtml(row.material_number || '-')}${escapeHtml(row.vendor || '-')}${Number(row.quantity_total || 0).toLocaleString('da-DK')}${formatDKK(Number(row.revenue_total || 0))}${formatDKK(Number(row.margin_total || 0))}
    Ingen produkter fundet