chore(back-end and front-end): refractor and improvements calculator

# Conflicts:
#	backend/src/main/java/com/printcalculator/controller/admin/AdminOrderController.java

.gitea/workflows/deploy.yaml

@@ -41,25 +41,38 @@ jobs:
           cache: "npm"
           cache-dependency-path: "frontend/package-lock.json"
 
-      - name: Install Chromium
+      - name: Resolve Chrome binary
         shell: bash
         run: |
-          apt-get update
-          apt-get install -y --no-install-recommends chromium
+          set -euo pipefail
+          if command -v chromium >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v chromium)"
+          elif command -v chromium-browser >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v chromium-browser)"
+          elif command -v google-chrome >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v google-chrome)"
+          else
+            apt-get update
+            apt-get install -y --no-install-recommends chromium
+            CHROME_PATH="$(command -v chromium)"
+          fi
+
+          echo "CHROME_BIN=$CHROME_PATH" >> "$GITHUB_ENV"
+          echo "Using CHROME_BIN=$CHROME_PATH"
 
       - name: Install frontend dependencies
         shell: bash
         run: |
           cd frontend
-          npm ci --no-audit --no-fund
+          npm ci --no-audit --no-fund --prefer-offline
 
       - name: Run frontend tests (headless)
         shell: bash
         env:
-          CHROME_BIN: /usr/bin/chromium
           CI: "true"
         run: |
           cd frontend
+          echo "Karma CHROME_BIN=$CHROME_BIN"
           npm run test -- --watch=false --browsers=ChromeHeadlessNoSandbox
 
   build-and-push:

.gitea/workflows/pr-checks.yaml

@@ -150,23 +150,36 @@ jobs:
           cache: "npm"
           cache-dependency-path: "frontend/package-lock.json"
 
-      - name: Install Chromium
+      - name: Resolve Chrome binary
         shell: bash
         run: |
-          apt-get update
-          apt-get install -y --no-install-recommends chromium
+          set -euo pipefail
+          if command -v chromium >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v chromium)"
+          elif command -v chromium-browser >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v chromium-browser)"
+          elif command -v google-chrome >/dev/null 2>&1; then
+            CHROME_PATH="$(command -v google-chrome)"
+          else
+            apt-get update
+            apt-get install -y --no-install-recommends chromium
+            CHROME_PATH="$(command -v chromium)"
+          fi
+
+          echo "CHROME_BIN=$CHROME_PATH" >> "$GITHUB_ENV"
+          echo "Using CHROME_BIN=$CHROME_PATH"
 
       - name: Install frontend dependencies
         shell: bash
         run: |
           cd frontend
-          npm ci --no-audit --no-fund
+          npm ci --no-audit --no-fund --prefer-offline
 
       - name: Run frontend tests (headless)
         shell: bash
         env:
-          CHROME_BIN: /usr/bin/chromium
           CI: "true"
         run: |
           cd frontend
+          echo "Karma CHROME_BIN=$CHROME_BIN"
           npm run test -- --watch=false --browsers=ChromeHeadlessNoSandbox

backend/Dockerfile

@@ -10,11 +10,13 @@ RUN ./gradlew bootJar -x test --no-daemon
 
 # Stage 2: Runtime Environment
 FROM eclipse-temurin:21-jre-jammy
+ARG ORCA_VERSION=2.3.1
+ARG ORCA_DOWNLOAD_URL
 
 # Install system dependencies for OrcaSlicer (same as before)
 RUN apt-get update && apt-get install -y \
     wget \
-    p7zip-full \
+    assimp-utils \
     libgl1 \
     libglib2.0-0 \
     libgtk-3-0 \
@@ -24,14 +26,42 @@ RUN apt-get update && apt-get install -y \
 
 # Install OrcaSlicer
 WORKDIR /opt
-RUN wget -q https://github.com/SoftFever/OrcaSlicer/releases/download/v2.2.0/OrcaSlicer_Linux_V2.2.0.AppImage -O OrcaSlicer.AppImage \
-    && 7z x OrcaSlicer.AppImage -o/opt/orcaslicer \
+RUN set -eux; \
+    ORCA_URL="${ORCA_DOWNLOAD_URL:-}"; \
+    if [ -n "${ORCA_URL}" ]; then \
+      wget -q "${ORCA_URL}" -O OrcaSlicer.AppImage; \
+    else \
+      CANDIDATES="\
+https://github.com/OrcaSlicer/OrcaSlicer/releases/download/v${ORCA_VERSION}/OrcaSlicer_Linux_AppImage_Ubuntu2204_V${ORCA_VERSION}.AppImage \
+https://github.com/SoftFever/OrcaSlicer/releases/download/v${ORCA_VERSION}/OrcaSlicer_Linux_AppImage_Ubuntu2204_V${ORCA_VERSION}.AppImage \
+https://github.com/SoftFever/OrcaSlicer/releases/download/v2.2.0/OrcaSlicer_Linux_V2.2.0.AppImage"; \
+      ok=0; \
+      for url in $CANDIDATES; do \
+        if wget -q --spider "$url"; then \
+          echo "Using OrcaSlicer URL: $url"; \
+          wget -q "$url" -O OrcaSlicer.AppImage; \
+          ok=1; \
+          break; \
+        fi; \
+      done; \
+      if [ "$ok" -ne 1 ]; then \
+        echo "Failed to find OrcaSlicer AppImage for version ${ORCA_VERSION}" >&2; \
+        echo "Tried URLs:" >&2; \
+        for url in $CANDIDATES; do echo " - $url" >&2; done; \
+        exit 1; \
+      fi; \
+    fi \
+    && chmod +x OrcaSlicer.AppImage \
+    && rm -rf /opt/orcaslicer /opt/squashfs-root \
+    && ./OrcaSlicer.AppImage --appimage-extract >/dev/null \
+    && mv /opt/squashfs-root /opt/orcaslicer \
     && chmod -R +x /opt/orcaslicer \
     && rm OrcaSlicer.AppImage
 
 ENV PATH="/opt/orcaslicer/usr/bin:${PATH}"
 # Set Slicer Path env variable for Java app
 ENV SLICER_PATH="/opt/orcaslicer/AppRun"
+ENV ASSIMP_PATH="assimp"
 
 WORKDIR /app
 # Copy JAR from build stage

backend/build.gradle

@@ -42,6 +42,15 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'net.codecrete.qrbill:qrbill-generator:3.4.0'
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	implementation platform('org.lwjgl:lwjgl-bom:3.3.4')
+	implementation 'org.lwjgl:lwjgl'
+	implementation 'org.lwjgl:lwjgl-assimp'
+	runtimeOnly 'org.lwjgl:lwjgl::natives-linux'
+	runtimeOnly 'org.lwjgl:lwjgl::natives-macos'
+	runtimeOnly 'org.lwjgl:lwjgl::natives-macos-arm64'
+	runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-linux'
+	runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-macos'
+	runtimeOnly 'org.lwjgl:lwjgl-assimp::natives-macos-arm64'
 
 
 

backend/src/main/java/com/printcalculator/controller/CustomQuoteRequestController.java

@@ -5,7 +5,7 @@ import com.printcalculator.entity.CustomQuoteRequest;
 import com.printcalculator.entity.CustomQuoteRequestAttachment;
 import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
 import com.printcalculator.repository.CustomQuoteRequestRepository;
-import com.printcalculator.service.ClamAVService;
+import com.printcalculator.service.storage.ClamAVService;
 import com.printcalculator.service.email.EmailNotificationService;
 import jakarta.validation.Valid;
 import org.slf4j.Logger;
@@ -29,6 +29,8 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.time.OffsetDateTime;
 import java.time.Year;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -53,6 +55,9 @@ public class CustomQuoteRequestController {
     @Value("${app.mail.contact-request.admin.address:infog@3d-fab.ch}")
     private String contactRequestAdminMailAddress;
 
+    @Value("${app.mail.contact-request.customer.enabled:true}")
+    private boolean contactRequestCustomerMailEnabled;
+
     // TODO: Inject Storage Service
     private static final Path STORAGE_ROOT = Paths.get("storage_requests").toAbsolutePath().normalize();
     private static final Pattern SAFE_EXTENSION_PATTERN = Pattern.compile("^[a-z0-9]{1,10}$");
@@ -97,6 +102,7 @@ public class CustomQuoteRequestController {
                     "Accettazione Termini e Privacy obbligatoria."
             );
         }
+        String language = normalizeLanguage(requestDto.getLanguage());
         
         // 1. Create Request
         CustomQuoteRequest request = new CustomQuoteRequest();
@@ -173,6 +179,7 @@ public class CustomQuoteRequestController {
         }
 
         sendAdminContactRequestNotification(request, attachmentsCount);
+        sendCustomerContactRequestConfirmation(request, attachmentsCount, language);
 
         return ResponseEntity.ok(request);
     }
@@ -258,6 +265,252 @@ public class CustomQuoteRequestController {
         );
     }
 
+    private void sendCustomerContactRequestConfirmation(CustomQuoteRequest request, int attachmentsCount, String language) {
+        if (!contactRequestCustomerMailEnabled) {
+            return;
+        }
+        if (request.getEmail() == null || request.getEmail().isBlank()) {
+            logger.warn("Contact request confirmation skipped: missing customer email for request {}", request.getId());
+            return;
+        }
+
+        Map<String, Object> templateData = new HashMap<>();
+        templateData.put("requestId", request.getId());
+        templateData.put(
+                "createdAt",
+                request.getCreatedAt().format(
+                        DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(localeForLanguage(language))
+                )
+        );
+        templateData.put("recipientName", resolveRecipientName(request, language));
+        templateData.put("requestType", localizeRequestType(request.getRequestType(), language));
+        templateData.put("customerType", localizeCustomerType(request.getCustomerType(), language));
+        templateData.put("name", safeValue(request.getName()));
+        templateData.put("companyName", safeValue(request.getCompanyName()));
+        templateData.put("contactPerson", safeValue(request.getContactPerson()));
+        templateData.put("email", safeValue(request.getEmail()));
+        templateData.put("phone", safeValue(request.getPhone()));
+        templateData.put("message", safeValue(request.getMessage()));
+        templateData.put("attachmentsCount", attachmentsCount);
+        templateData.put("currentYear", Year.now().getValue());
+        String subject = applyCustomerContactRequestTexts(templateData, language, request.getId());
+
+        emailNotificationService.sendEmail(
+                request.getEmail(),
+                subject,
+                "contact-request-customer",
+                templateData
+        );
+    }
+
+    private String applyCustomerContactRequestTexts(
+            Map<String, Object> templateData,
+            String language,
+            UUID requestId
+    ) {
+        return switch (language) {
+            case "en" -> {
+                templateData.put("emailTitle", "Contact request received");
+                templateData.put("headlineText", "We received your contact request");
+                templateData.put("greetingText", "Hi " + templateData.get("recipientName") + ",");
+                templateData.put("introText", "Thank you for contacting us. Our team will reply as soon as possible.");
+                templateData.put("requestIdHintText", "Please keep this request ID for future order references:");
+                templateData.put("detailsTitleText", "Request details");
+                templateData.put("labelRequestId", "Request ID");
+                templateData.put("labelDate", "Date");
+                templateData.put("labelRequestType", "Request type");
+                templateData.put("labelCustomerType", "Customer type");
+                templateData.put("labelName", "Name");
+                templateData.put("labelCompany", "Company");
+                templateData.put("labelContactPerson", "Contact person");
+                templateData.put("labelEmail", "Email");
+                templateData.put("labelPhone", "Phone");
+                templateData.put("labelMessage", "Message");
+                templateData.put("labelAttachments", "Attachments");
+                templateData.put("supportText", "If you need help, reply to this email.");
+                templateData.put("footerText", "Automated request-receipt confirmation from 3D-Fab.");
+                yield "We received your contact request #" + requestId + " - 3D-Fab";
+            }
+            case "de" -> {
+                templateData.put("emailTitle", "Kontaktanfrage erhalten");
+                templateData.put("headlineText", "Wir haben Ihre Kontaktanfrage erhalten");
+                templateData.put("greetingText", "Hallo " + templateData.get("recipientName") + ",");
+                templateData.put("introText", "Vielen Dank fuer Ihre Anfrage. Unser Team antwortet Ihnen so schnell wie moeglich.");
+                templateData.put("requestIdHintText", "Bitte speichern Sie diese Anfrage-ID fuer zukuenftige Bestellreferenzen:");
+                templateData.put("detailsTitleText", "Anfragedetails");
+                templateData.put("labelRequestId", "Anfrage-ID");
+                templateData.put("labelDate", "Datum");
+                templateData.put("labelRequestType", "Anfragetyp");
+                templateData.put("labelCustomerType", "Kundentyp");
+                templateData.put("labelName", "Name");
+                templateData.put("labelCompany", "Firma");
+                templateData.put("labelContactPerson", "Kontaktperson");
+                templateData.put("labelEmail", "E-Mail");
+                templateData.put("labelPhone", "Telefon");
+                templateData.put("labelMessage", "Nachricht");
+                templateData.put("labelAttachments", "Anhaenge");
+                templateData.put("supportText", "Wenn Sie Hilfe brauchen, antworten Sie auf diese E-Mail.");
+                templateData.put("footerText", "Automatische Bestaetigung des Anfrageeingangs von 3D-Fab.");
+                yield "Wir haben Ihre Kontaktanfrage erhalten #" + requestId + " - 3D-Fab";
+            }
+            case "fr" -> {
+                templateData.put("emailTitle", "Demande de contact recue");
+                templateData.put("headlineText", "Nous avons recu votre demande de contact");
+                templateData.put("greetingText", "Bonjour " + templateData.get("recipientName") + ",");
+                templateData.put("introText", "Merci pour votre message. Notre equipe vous repondra des que possible.");
+                templateData.put("requestIdHintText", "Veuillez conserver cet ID de demande pour vos futures references de commande :");
+                templateData.put("detailsTitleText", "Details de la demande");
+                templateData.put("labelRequestId", "ID de demande");
+                templateData.put("labelDate", "Date");
+                templateData.put("labelRequestType", "Type de demande");
+                templateData.put("labelCustomerType", "Type de client");
+                templateData.put("labelName", "Nom");
+                templateData.put("labelCompany", "Entreprise");
+                templateData.put("labelContactPerson", "Contact");
+                templateData.put("labelEmail", "Email");
+                templateData.put("labelPhone", "Telephone");
+                templateData.put("labelMessage", "Message");
+                templateData.put("labelAttachments", "Pieces jointes");
+                templateData.put("supportText", "Si vous avez besoin d'aide, repondez a cet email.");
+                templateData.put("footerText", "Confirmation automatique de reception de demande par 3D-Fab.");
+                yield "Nous avons recu votre demande de contact #" + requestId + " - 3D-Fab";
+            }
+            default -> {
+                templateData.put("emailTitle", "Richiesta di contatto ricevuta");
+                templateData.put("headlineText", "Abbiamo ricevuto la tua richiesta di contatto");
+                templateData.put("greetingText", "Ciao " + templateData.get("recipientName") + ",");
+                templateData.put("introText", "Grazie per averci contattato. Il nostro team ti rispondera' il prima possibile.");
+                templateData.put("requestIdHintText", "Conserva questo ID richiesta per i futuri riferimenti d'ordine:");
+                templateData.put("detailsTitleText", "Dettagli richiesta");
+                templateData.put("labelRequestId", "ID richiesta");
+                templateData.put("labelDate", "Data");
+                templateData.put("labelRequestType", "Tipo richiesta");
+                templateData.put("labelCustomerType", "Tipo cliente");
+                templateData.put("labelName", "Nome");
+                templateData.put("labelCompany", "Azienda");
+                templateData.put("labelContactPerson", "Contatto");
+                templateData.put("labelEmail", "Email");
+                templateData.put("labelPhone", "Telefono");
+                templateData.put("labelMessage", "Messaggio");
+                templateData.put("labelAttachments", "Allegati");
+                templateData.put("supportText", "Se hai bisogno, rispondi direttamente a questa email.");
+                templateData.put("footerText", "Conferma automatica di ricezione richiesta da 3D-Fab.");
+                yield "Abbiamo ricevuto la tua richiesta di contatto #" + requestId + " - 3D-Fab";
+            }
+        };
+    }
+
+    private String localizeRequestType(String requestType, String language) {
+        if (requestType == null || requestType.isBlank()) {
+            return "-";
+        }
+
+        String normalized = requestType.trim().toLowerCase(Locale.ROOT);
+        return switch (language) {
+            case "en" -> switch (normalized) {
+                case "custom", "print_service" -> "Custom part request";
+                case "series" -> "Series production request";
+                case "consult", "design_service" -> "Consultation request";
+                case "question" -> "General question";
+                default -> requestType;
+            };
+            case "de" -> switch (normalized) {
+                case "custom", "print_service" -> "Anfrage fuer Einzelteil";
+                case "series" -> "Anfrage fuer Serienproduktion";
+                case "consult", "design_service" -> "Beratungsanfrage";
+                case "question" -> "Allgemeine Frage";
+                default -> requestType;
+            };
+            case "fr" -> switch (normalized) {
+                case "custom", "print_service" -> "Demande de piece personnalisee";
+                case "series" -> "Demande de production en serie";
+                case "consult", "design_service" -> "Demande de conseil";
+                case "question" -> "Question generale";
+                default -> requestType;
+            };
+            default -> switch (normalized) {
+                case "custom", "print_service" -> "Richiesta pezzo personalizzato";
+                case "series" -> "Richiesta produzione in serie";
+                case "consult", "design_service" -> "Richiesta consulenza";
+                case "question" -> "Domanda generale";
+                default -> requestType;
+            };
+        };
+    }
+
+    private String localizeCustomerType(String customerType, String language) {
+        if (customerType == null || customerType.isBlank()) {
+            return "-";
+        }
+        String normalized = customerType.trim().toLowerCase(Locale.ROOT);
+        return switch (language) {
+            case "en" -> switch (normalized) {
+                case "private" -> "Private";
+                case "business" -> "Business";
+                default -> customerType;
+            };
+            case "de" -> switch (normalized) {
+                case "private" -> "Privat";
+                case "business" -> "Unternehmen";
+                default -> customerType;
+            };
+            case "fr" -> switch (normalized) {
+                case "private" -> "Prive";
+                case "business" -> "Entreprise";
+                default -> customerType;
+            };
+            default -> switch (normalized) {
+                case "private" -> "Privato";
+                case "business" -> "Azienda";
+                default -> customerType;
+            };
+        };
+    }
+
+    private Locale localeForLanguage(String language) {
+        return switch (language) {
+            case "en" -> Locale.ENGLISH;
+            case "de" -> Locale.GERMAN;
+            case "fr" -> Locale.FRENCH;
+            default -> Locale.ITALIAN;
+        };
+    }
+
+    private String normalizeLanguage(String language) {
+        if (language == null || language.isBlank()) {
+            return "it";
+        }
+        String normalized = language.toLowerCase(Locale.ROOT).trim();
+        if (normalized.startsWith("en")) {
+            return "en";
+        }
+        if (normalized.startsWith("de")) {
+            return "de";
+        }
+        if (normalized.startsWith("fr")) {
+            return "fr";
+        }
+        return "it";
+    }
+
+    private String resolveRecipientName(CustomQuoteRequest request, String language) {
+        if (request.getName() != null && !request.getName().isBlank()) {
+            return request.getName().trim();
+        }
+        if (request.getContactPerson() != null && !request.getContactPerson().isBlank()) {
+            return request.getContactPerson().trim();
+        }
+        if (request.getCompanyName() != null && !request.getCompanyName().isBlank()) {
+            return request.getCompanyName().trim();
+        }
+        return switch (language) {
+            case "en" -> "customer";
+            case "de" -> "Kunde";
+            case "fr" -> "client";
+            default -> "cliente";
+        };
+    }
+
     private String safeValue(String value) {
         if (value == null || value.isBlank()) {
             return "-";

backend/src/main/java/com/printcalculator/controller/OptionsController.java

@@ -3,17 +3,16 @@ package com.printcalculator.controller;
 import com.printcalculator.dto.OptionsResponse;
 import com.printcalculator.entity.FilamentMaterialType;
 import com.printcalculator.entity.FilamentVariant;
-import com.printcalculator.entity.LayerHeightOption;
 import com.printcalculator.entity.MaterialOrcaProfileMap;
 import com.printcalculator.entity.NozzleOption;
 import com.printcalculator.entity.PrinterMachine;
 import com.printcalculator.entity.PrinterMachineProfile;
 import com.printcalculator.repository.FilamentMaterialTypeRepository;
 import com.printcalculator.repository.FilamentVariantRepository;
-import com.printcalculator.repository.LayerHeightOptionRepository;
 import com.printcalculator.repository.MaterialOrcaProfileMapRepository;
 import com.printcalculator.repository.NozzleOptionRepository;
 import com.printcalculator.repository.PrinterMachineRepository;
+import com.printcalculator.service.NozzleLayerHeightPolicyService;
 import com.printcalculator.service.OrcaProfileResolver;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.math.BigDecimal;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -32,26 +32,26 @@ public class OptionsController {
 
     private final FilamentMaterialTypeRepository materialRepo;
     private final FilamentVariantRepository variantRepo;
-    private final LayerHeightOptionRepository layerHeightRepo;
     private final NozzleOptionRepository nozzleRepo;
     private final PrinterMachineRepository printerMachineRepo;
     private final MaterialOrcaProfileMapRepository materialOrcaMapRepo;
     private final OrcaProfileResolver orcaProfileResolver;
+    private final NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService;
 
     public OptionsController(FilamentMaterialTypeRepository materialRepo,
                              FilamentVariantRepository variantRepo,
-                             LayerHeightOptionRepository layerHeightRepo,
                              NozzleOptionRepository nozzleRepo,
                              PrinterMachineRepository printerMachineRepo,
                              MaterialOrcaProfileMapRepository materialOrcaMapRepo,
-                             OrcaProfileResolver orcaProfileResolver) {
+                             OrcaProfileResolver orcaProfileResolver,
+                             NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService) {
         this.materialRepo = materialRepo;
         this.variantRepo = variantRepo;
-        this.layerHeightRepo = layerHeightRepo;
         this.nozzleRepo = nozzleRepo;
         this.printerMachineRepo = printerMachineRepo;
         this.materialOrcaMapRepo = materialOrcaMapRepo;
         this.orcaProfileResolver = orcaProfileResolver;
+        this.nozzleLayerHeightPolicyService = nozzleLayerHeightPolicyService;
     }
 
     @GetMapping("/api/calculator/options")
@@ -116,15 +116,6 @@ public class OptionsController {
                 new OptionsResponse.InfillPatternOption("cubic", "Cubic")
         );
 
-        List<OptionsResponse.LayerHeightOptionDTO> layers = layerHeightRepo.findAll().stream()
-                .filter(l -> Boolean.TRUE.equals(l.getIsActive()))
-                .sorted(Comparator.comparing(LayerHeightOption::getLayerHeightMm))
-                .map(l -> new OptionsResponse.LayerHeightOptionDTO(
-                        l.getLayerHeightMm().doubleValue(),
-                        String.format("%.2f mm", l.getLayerHeightMm())
-                ))
-                .toList();
-
         List<OptionsResponse.NozzleOptionDTO> nozzles = nozzleRepo.findAll().stream()
                 .filter(n -> Boolean.TRUE.equals(n.getIsActive()))
                 .sorted(Comparator.comparing(NozzleOption::getNozzleDiameterMm))
@@ -137,7 +128,31 @@ public class OptionsController {
                 ))
                 .toList();
 
-        return ResponseEntity.ok(new OptionsResponse(materialOptions, qualities, patterns, layers, nozzles));
+        Map<BigDecimal, List<BigDecimal>> rulesByNozzle = nozzleLayerHeightPolicyService.getActiveRulesByNozzle();
+        BigDecimal selectedNozzle = nozzleLayerHeightPolicyService.resolveNozzle(
+                nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
+        );
+
+        List<OptionsResponse.LayerHeightOptionDTO> layers = toLayerDtos(rulesByNozzle.getOrDefault(selectedNozzle, List.of()));
+        if (layers.isEmpty()) {
+            layers = rulesByNozzle.values().stream().findFirst().map(this::toLayerDtos).orElse(List.of());
+        }
+
+        List<OptionsResponse.NozzleLayerHeightOptionsDTO> layerHeightsByNozzle = rulesByNozzle.entrySet().stream()
+                .map(entry -> new OptionsResponse.NozzleLayerHeightOptionsDTO(
+                        entry.getKey().doubleValue(),
+                        toLayerDtos(entry.getValue())
+                ))
+                .toList();
+
+        return ResponseEntity.ok(new OptionsResponse(
+                materialOptions,
+                qualities,
+                patterns,
+                layers,
+                nozzles,
+                layerHeightsByNozzle
+        ));
     }
 
     private Set<Long> resolveCompatibleMaterialTypeIds(Long printerMachineId, Double nozzleDiameter) {
@@ -152,9 +167,9 @@ public class OptionsController {
             return Set.of();
         }
 
-        BigDecimal nozzle = nozzleDiameter != null
-                ? BigDecimal.valueOf(nozzleDiameter)
-                : BigDecimal.valueOf(0.40);
+        BigDecimal nozzle = nozzleLayerHeightPolicyService.resolveNozzle(
+                nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
+        );
 
         PrinterMachineProfile machineProfile = orcaProfileResolver
                 .resolveMachineProfile(machine, nozzle)
@@ -172,6 +187,16 @@ public class OptionsController {
                 .collect(Collectors.toSet());
     }
 
+    private List<OptionsResponse.LayerHeightOptionDTO> toLayerDtos(List<BigDecimal> layers) {
+        return layers.stream()
+                .sorted(Comparator.naturalOrder())
+                .map(layer -> new OptionsResponse.LayerHeightOptionDTO(
+                        layer.doubleValue(),
+                        String.format("%.2f mm", layer)
+                ))
+                .toList();
+    }
+
     private String resolveHexColor(FilamentVariant variant) {
         if (variant.getColorHex() != null && !variant.getColorHex().isBlank()) {
             return variant.getColorHex();

backend/src/main/java/com/printcalculator/controller/OrderController.java

@@ -1,140 +1,62 @@
 package com.printcalculator.controller;
 
-import com.printcalculator.dto.*;
-import com.printcalculator.entity.*;
-import com.printcalculator.repository.*;
-import com.printcalculator.service.InvoicePdfRenderingService;
-import com.printcalculator.service.OrderService;
-import com.printcalculator.service.PaymentService;
-import com.printcalculator.service.QrBillService;
-import com.printcalculator.service.StorageService;
-import com.printcalculator.service.TwintPaymentService;
+import com.printcalculator.dto.CreateOrderRequest;
+import com.printcalculator.dto.OrderDto;
+import com.printcalculator.service.order.OrderControllerService;
+import jakarta.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import jakarta.validation.Valid;
 
 import java.io.IOException;
-
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-
-import java.util.List;
-import java.util.UUID;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.Base64;
-import java.util.stream.Collectors;
-import java.net.URI;
-import java.util.Locale;
-import java.util.regex.Pattern;
+import java.util.UUID;
 
 @RestController
 @RequestMapping("/api/orders")
 public class OrderController {
-    private static final Pattern SAFE_EXTENSION_PATTERN = Pattern.compile("^[a-z0-9]{1,10}$");
 
-    private final OrderService orderService;
-    private final OrderRepository orderRepo;
-    private final OrderItemRepository orderItemRepo;
-    private final QuoteSessionRepository quoteSessionRepo;
-    private final QuoteLineItemRepository quoteLineItemRepo;
-    private final CustomerRepository customerRepo;
-    private final StorageService storageService;
-    private final InvoicePdfRenderingService invoiceService;
-    private final QrBillService qrBillService;
-    private final TwintPaymentService twintPaymentService;
-    private final PaymentService paymentService;
-    private final PaymentRepository paymentRepo;
+    private final OrderControllerService orderControllerService;
 
-
-    public OrderController(OrderService orderService,
-                           OrderRepository orderRepo,
-                           OrderItemRepository orderItemRepo,
-                           QuoteSessionRepository quoteSessionRepo,
-                           QuoteLineItemRepository quoteLineItemRepo,
-                           CustomerRepository customerRepo,
-                           StorageService storageService,
-                           InvoicePdfRenderingService invoiceService,
-                           QrBillService qrBillService,
-                           TwintPaymentService twintPaymentService,
-                           PaymentService paymentService,
-                           PaymentRepository paymentRepo) {
-        this.orderService = orderService;
-        this.orderRepo = orderRepo;
-        this.orderItemRepo = orderItemRepo;
-        this.quoteSessionRepo = quoteSessionRepo;
-        this.quoteLineItemRepo = quoteLineItemRepo;
-        this.customerRepo = customerRepo;
-        this.storageService = storageService;
-        this.invoiceService = invoiceService;
-        this.qrBillService = qrBillService;
-        this.twintPaymentService = twintPaymentService;
-        this.paymentService = paymentService;
-        this.paymentRepo = paymentRepo;
+    public OrderController(OrderControllerService orderControllerService) {
+        this.orderControllerService = orderControllerService;
     }
 
-
-    // 1. Create Order from Quote
     @PostMapping("/from-quote/{quoteSessionId}")
     @Transactional
     public ResponseEntity<OrderDto> createOrderFromQuote(
             @PathVariable UUID quoteSessionId,
-            @Valid @RequestBody com.printcalculator.dto.CreateOrderRequest request
+            @Valid @RequestBody CreateOrderRequest request
     ) {
-        Order order = orderService.createOrderFromQuote(quoteSessionId, request);
-        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
-        return ResponseEntity.ok(convertToDto(order, items));
+        return ResponseEntity.ok(orderControllerService.createOrderFromQuote(quoteSessionId, request));
     }
-    
+
     @PostMapping(value = "/{orderId}/items/{orderItemId}/file", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Transactional
     public ResponseEntity<Void> uploadOrderItemFile(
-        @PathVariable UUID orderId,
-        @PathVariable UUID orderItemId,
-        @RequestParam("file") MultipartFile file
+            @PathVariable UUID orderId,
+            @PathVariable UUID orderItemId,
+            @RequestParam("file") MultipartFile file
     ) throws IOException {
-        
-        OrderItem item = orderItemRepo.findById(orderItemId)
-                .orElseThrow(() -> new RuntimeException("OrderItem not found"));
-                
-        if (!item.getOrder().getId().equals(orderId)) {
+        boolean uploaded = orderControllerService.uploadOrderItemFile(orderId, orderItemId, file);
+        if (!uploaded) {
             return ResponseEntity.badRequest().build();
         }
-        
-        String relativePath = item.getStoredRelativePath();
-        Path destinationRelativePath;
-        if (relativePath == null || relativePath.equals("PENDING")) {
-             String ext = getExtension(file.getOriginalFilename());
-             String storedFilename = UUID.randomUUID() + "." + ext;
-             destinationRelativePath = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString(), storedFilename);
-             item.setStoredRelativePath(destinationRelativePath.toString());
-             item.setStoredFilename(storedFilename);
-        } else {
-            destinationRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
-            if (destinationRelativePath == null) {
-                return ResponseEntity.badRequest().build();
-            }
-        }
-
-        storageService.store(file, destinationRelativePath);
-        item.setFileSizeBytes(file.getSize());
-        item.setMimeType(file.getContentType());
-        orderItemRepo.save(item);
-        
         return ResponseEntity.ok().build();
     }
 
     @GetMapping("/{orderId}")
     public ResponseEntity<OrderDto> getOrder(@PathVariable UUID orderId) {
-        return orderRepo.findById(orderId)
-                .map(o -> {
-                    List<OrderItem> items = orderItemRepo.findByOrder_Id(o.getId());
-                    return ResponseEntity.ok(convertToDto(o, items));
-                })
+        return orderControllerService.getOrder(orderId)
+                .map(ResponseEntity::ok)
                 .orElse(ResponseEntity.notFound().build());
     }
 
@@ -144,89 +66,29 @@ public class OrderController {
             @PathVariable UUID orderId,
             @RequestBody Map<String, String> payload
     ) {
-        String method = payload.get("method");
-        paymentService.reportPayment(orderId, method);
-        return getOrder(orderId);
+        return orderControllerService.reportPayment(orderId, payload.get("method"))
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
     }
 
     @GetMapping("/{orderId}/confirmation")
     public ResponseEntity<byte[]> getConfirmation(@PathVariable UUID orderId) {
-        return generateDocument(orderId, true);
+        return orderControllerService.getConfirmation(orderId);
     }
 
     @GetMapping("/{orderId}/invoice")
     public ResponseEntity<byte[]> getInvoice(@PathVariable UUID orderId) {
-        // Paid invoices are sent by email after back-office payment confirmation.
-        // The public endpoint must not expose a "paid" invoice download.
         return ResponseEntity.notFound().build();
     }
 
-    private ResponseEntity<byte[]> generateDocument(UUID orderId, boolean isConfirmation) {
-        Order order = orderRepo.findById(orderId)
-                .orElseThrow(() -> new RuntimeException("Order not found"));
-
-        if (isConfirmation) {
-            Path relativePath = buildConfirmationPdfRelativePath(order);
-            try {
-                byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
-                return ResponseEntity.ok()
-                        .header("Content-Disposition", "attachment; filename=\"confirmation-" + getDisplayOrderNumber(order) + ".pdf\"")
-                        .contentType(MediaType.APPLICATION_PDF)
-                        .body(existingPdf);
-            } catch (Exception ignored) {
-                // Fallback to on-the-fly generation if the stored file is missing or unreadable.
-            }
-        }
-
-        List<OrderItem> items = orderItemRepo.findByOrder_Id(orderId);
-        Payment payment = paymentRepo.findByOrder_Id(orderId).orElse(null);
-
-        byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
-        String typePrefix = isConfirmation ? "confirmation-" : "invoice-";
-        String truncatedUuid = order.getId().toString().substring(0, 8);
-        return ResponseEntity.ok()
-                .header("Content-Disposition", "attachment; filename=\"" + typePrefix + truncatedUuid + ".pdf\"")
-                .contentType(MediaType.APPLICATION_PDF)
-                .body(pdf);
-    }
-
-    private Path buildConfirmationPdfRelativePath(Order order) {
-        return Path.of(
-                "orders",
-                order.getId().toString(),
-                "documents",
-                "confirmation-" + getDisplayOrderNumber(order) + ".pdf"
-        );
-    }
-
     @GetMapping("/{orderId}/twint")
     public ResponseEntity<Map<String, String>> getTwintPayment(@PathVariable UUID orderId) {
-        Order order = orderRepo.findById(orderId).orElse(null);
-        if (order == null) {
-            return ResponseEntity.notFound().build();
-        }
-
-        byte[] qrPng = twintPaymentService.generateQrPng(order, 360);
-        String qrDataUri = "data:image/png;base64," + Base64.getEncoder().encodeToString(qrPng);
-
-        Map<String, String> data = new HashMap<>();
-        data.put("paymentUrl", twintPaymentService.getTwintPaymentUrl(order));
-        data.put("openUrl", "/api/orders/" + orderId + "/twint/open");
-        data.put("qrImageUrl", "/api/orders/" + orderId + "/twint/qr");
-        data.put("qrImageDataUri", qrDataUri);
-        return ResponseEntity.ok(data);
+        return orderControllerService.getTwintPayment(orderId);
     }
 
     @GetMapping("/{orderId}/twint/open")
     public ResponseEntity<Void> openTwintPayment(@PathVariable UUID orderId) {
-        Order order = orderRepo.findById(orderId).orElse(null);
-        if (order == null) {
-            return ResponseEntity.notFound().build();
-        }
-
-        return ResponseEntity.status(302)
-                .location(URI.create(twintPaymentService.getTwintPaymentUrl(order)))
-                .build();
+        return orderControllerService.openTwintPayment(orderId);
     }
 
     @GetMapping("/{orderId}/twint/qr")
@@ -234,127 +96,6 @@ public class OrderController {
             @PathVariable UUID orderId,
             @RequestParam(defaultValue = "320") int size
     ) {
-        Order order = orderRepo.findById(orderId).orElse(null);
-        if (order == null) {
-            return ResponseEntity.notFound().build();
-        }
-
-        int normalizedSize = Math.max(200, Math.min(size, 600));
-        byte[] png = twintPaymentService.generateQrPng(order, normalizedSize);
-
-        return ResponseEntity.ok()
-                .contentType(MediaType.IMAGE_PNG)
-                .body(png);
+        return orderControllerService.getTwintQr(orderId, size);
     }
-    
-    private String getExtension(String filename) {
-        if (filename == null) return "stl";
-        String cleaned = StringUtils.cleanPath(filename);
-        if (cleaned.contains("..")) {
-            return "stl";
-        }
-        int i = cleaned.lastIndexOf('.');
-        if (i > 0 && i < cleaned.length() - 1) {
-            String ext = cleaned.substring(i + 1).toLowerCase(Locale.ROOT);
-            if (SAFE_EXTENSION_PATTERN.matcher(ext).matches()) {
-                return ext;
-            }
-        }
-        return "stl";
-    }
-
-    private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
-        try {
-            Path candidate = Path.of(storedRelativePath).normalize();
-            if (candidate.isAbsolute()) {
-                return null;
-            }
-
-            Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
-            if (!candidate.startsWith(expectedPrefix)) {
-                return null;
-            }
-
-            return candidate;
-        } catch (InvalidPathException e) {
-            return null;
-        }
-    }
-
-    private OrderDto convertToDto(Order order, List<OrderItem> items) {
-        OrderDto dto = new OrderDto();
-        dto.setId(order.getId());
-        dto.setOrderNumber(getDisplayOrderNumber(order));
-        dto.setStatus(order.getStatus());
-
-        paymentRepo.findByOrder_Id(order.getId()).ifPresent(p -> {
-            dto.setPaymentStatus(p.getStatus());
-            dto.setPaymentMethod(p.getMethod());
-        });
-
-        dto.setCustomerEmail(order.getCustomerEmail());
-        dto.setCustomerPhone(order.getCustomerPhone());
-        dto.setPreferredLanguage(order.getPreferredLanguage());
-        dto.setBillingCustomerType(order.getBillingCustomerType());
-        dto.setCurrency(order.getCurrency());
-        dto.setSetupCostChf(order.getSetupCostChf());
-        dto.setShippingCostChf(order.getShippingCostChf());
-        dto.setDiscountChf(order.getDiscountChf());
-        dto.setSubtotalChf(order.getSubtotalChf());
-        dto.setTotalChf(order.getTotalChf());
-        dto.setCreatedAt(order.getCreatedAt());
-        dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
-
-        AddressDto billing = new AddressDto();
-        billing.setFirstName(order.getBillingFirstName());
-        billing.setLastName(order.getBillingLastName());
-        billing.setCompanyName(order.getBillingCompanyName());
-        billing.setContactPerson(order.getBillingContactPerson());
-        billing.setAddressLine1(order.getBillingAddressLine1());
-        billing.setAddressLine2(order.getBillingAddressLine2());
-        billing.setZip(order.getBillingZip());
-        billing.setCity(order.getBillingCity());
-        billing.setCountryCode(order.getBillingCountryCode());
-        dto.setBillingAddress(billing);
-
-        if (!order.getShippingSameAsBilling()) {
-            AddressDto shipping = new AddressDto();
-            shipping.setFirstName(order.getShippingFirstName());
-            shipping.setLastName(order.getShippingLastName());
-            shipping.setCompanyName(order.getShippingCompanyName());
-            shipping.setContactPerson(order.getShippingContactPerson());
-            shipping.setAddressLine1(order.getShippingAddressLine1());
-            shipping.setAddressLine2(order.getShippingAddressLine2());
-            shipping.setZip(order.getShippingZip());
-            shipping.setCity(order.getShippingCity());
-            shipping.setCountryCode(order.getShippingCountryCode());
-            dto.setShippingAddress(shipping);
-        }
-
-        List<OrderItemDto> itemDtos = items.stream().map(i -> {
-            OrderItemDto idto = new OrderItemDto();
-            idto.setId(i.getId());
-            idto.setOriginalFilename(i.getOriginalFilename());
-            idto.setMaterialCode(i.getMaterialCode());
-            idto.setColorCode(i.getColorCode());
-            idto.setQuantity(i.getQuantity());
-            idto.setPrintTimeSeconds(i.getPrintTimeSeconds());
-            idto.setMaterialGrams(i.getMaterialGrams());
-            idto.setUnitPriceChf(i.getUnitPriceChf());
-            idto.setLineTotalChf(i.getLineTotalChf());
-            return idto;
-        }).collect(Collectors.toList());
-        dto.setItems(itemDtos);
-
-        return dto;
-    }
-
-    private String getDisplayOrderNumber(Order order) {
-        String orderNumber = order.getOrderNumber();
-        if (orderNumber != null && !orderNumber.isBlank()) {
-            return orderNumber;
-        }
-        return order.getId() != null ? order.getId().toString() : "unknown";
-    }
-
 }

backend/src/main/java/com/printcalculator/controller/QuoteController.java

@@ -4,17 +4,23 @@ import com.printcalculator.entity.PrinterMachine;
 import com.printcalculator.model.PrintStats;
 import com.printcalculator.model.QuoteResult;
 import com.printcalculator.repository.PrinterMachineRepository;
+import com.printcalculator.service.NozzleLayerHeightPolicyService;
 import com.printcalculator.service.QuoteCalculator;
 import com.printcalculator.service.SlicerService;
+import com.printcalculator.service.storage.ClamAVService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
 
 @RestController
 public class QuoteController {
@@ -22,17 +28,23 @@ public class QuoteController {
     private final SlicerService slicerService;
     private final QuoteCalculator quoteCalculator;
     private final PrinterMachineRepository machineRepo;
-    private final com.printcalculator.service.ClamAVService clamAVService;
+    private final ClamAVService clamAVService;
+    private final NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService;
 
     // Defaults (using aliases defined in ProfileManager)
     private static final String DEFAULT_FILAMENT = "pla_basic";
     private static final String DEFAULT_PROCESS = "standard";
 
-    public QuoteController(SlicerService slicerService, QuoteCalculator quoteCalculator, PrinterMachineRepository machineRepo, com.printcalculator.service.ClamAVService clamAVService) {
+    public QuoteController(SlicerService slicerService,
+                           QuoteCalculator quoteCalculator,
+                           PrinterMachineRepository machineRepo,
+                           ClamAVService clamAVService,
+                           NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService) {
         this.slicerService = slicerService;
         this.quoteCalculator = quoteCalculator;
         this.machineRepo = machineRepo;
         this.clamAVService = clamAVService;
+        this.nozzleLayerHeightPolicyService = nozzleLayerHeightPolicyService;
     }
 
     @PostMapping("/api/quote")
@@ -69,15 +81,27 @@ public class QuoteController {
         if (infillPattern != null && !infillPattern.isEmpty()) {
             processOverrides.put("sparse_infill_pattern", infillPattern);
         }
+        BigDecimal normalizedNozzle = nozzleLayerHeightPolicyService.resolveNozzle(
+                nozzleDiameter != null ? BigDecimal.valueOf(nozzleDiameter) : null
+        );
         if (layerHeight != null) {
-            processOverrides.put("layer_height", String.valueOf(layerHeight));
+            BigDecimal normalizedLayer = nozzleLayerHeightPolicyService.normalizeLayer(BigDecimal.valueOf(layerHeight));
+            if (!nozzleLayerHeightPolicyService.isAllowed(normalizedNozzle, normalizedLayer)) {
+                throw new ResponseStatusException(
+                        BAD_REQUEST,
+                        "Layer height " + normalizedLayer.stripTrailingZeros().toPlainString()
+                                + " is not allowed for nozzle " + normalizedNozzle.stripTrailingZeros().toPlainString()
+                                + ". Allowed: " + nozzleLayerHeightPolicyService.allowedLayersLabel(normalizedNozzle)
+                );
+            }
+            processOverrides.put("layer_height", normalizedLayer.stripTrailingZeros().toPlainString());
         }
         if (supportEnabled != null) {
             processOverrides.put("enable_support", supportEnabled ? "1" : "0");
         }
 
         if (nozzleDiameter != null) {
-            machineOverrides.put("nozzle_diameter", String.valueOf(nozzleDiameter));
+            machineOverrides.put("nozzle_diameter", normalizedNozzle.stripTrailingZeros().toPlainString());
             // Also need to ensure the printer profile is compatible or just override?
             // Usually nozzle diameter changes require a different printer profile or deep overrides.
             // For now, we trust the override key works on the base profile.

backend/src/main/java/com/printcalculator/controller/QuoteSessionController.java

@@ -1,475 +1,148 @@
 package com.printcalculator.controller;
 
-import com.printcalculator.entity.FilamentMaterialType;
-import com.printcalculator.entity.FilamentVariant;
-import com.printcalculator.entity.PrinterMachine;
+import com.printcalculator.dto.PrintSettingsDto;
 import com.printcalculator.entity.QuoteLineItem;
 import com.printcalculator.entity.QuoteSession;
-import com.printcalculator.model.ModelDimensions;
-import com.printcalculator.model.PrintStats;
-import com.printcalculator.model.QuoteResult;
-import com.printcalculator.repository.FilamentMaterialTypeRepository;
-import com.printcalculator.repository.FilamentVariantRepository;
-import com.printcalculator.repository.PrinterMachineRepository;
 import com.printcalculator.repository.QuoteLineItemRepository;
 import com.printcalculator.repository.QuoteSessionRepository;
-import com.printcalculator.service.OrcaProfileResolver;
 import com.printcalculator.service.QuoteCalculator;
-import com.printcalculator.service.SlicerService;
+import com.printcalculator.service.QuoteSessionTotalsService;
+import com.printcalculator.service.quote.QuoteSessionItemService;
+import com.printcalculator.service.quote.QuoteSessionResponseAssembler;
+import com.printcalculator.service.quote.QuoteStorageService;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.Optional;
-import java.util.Locale;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
 
 @RestController
 @RequestMapping("/api/quote-sessions")
-
 public class QuoteSessionController {
-    private static final Path QUOTE_STORAGE_ROOT = Paths.get("storage_quotes").toAbsolutePath().normalize();
-
     private final QuoteSessionRepository sessionRepo;
     private final QuoteLineItemRepository lineItemRepo;
-    private final SlicerService slicerService;
     private final QuoteCalculator quoteCalculator;
-    private final PrinterMachineRepository machineRepo;
-    private final FilamentMaterialTypeRepository materialRepo;
-    private final FilamentVariantRepository variantRepo;
-    private final OrcaProfileResolver orcaProfileResolver;
     private final com.printcalculator.repository.PricingPolicyRepository pricingRepo;
-    private final com.printcalculator.service.ClamAVService clamAVService;
+    private final QuoteSessionTotalsService quoteSessionTotalsService;
+    private final QuoteSessionItemService quoteSessionItemService;
+    private final QuoteStorageService quoteStorageService;
+    private final QuoteSessionResponseAssembler quoteSessionResponseAssembler;
 
     public QuoteSessionController(QuoteSessionRepository sessionRepo,
                                   QuoteLineItemRepository lineItemRepo,
-                                  SlicerService slicerService,
                                   QuoteCalculator quoteCalculator,
-                                  PrinterMachineRepository machineRepo,
-                                  FilamentMaterialTypeRepository materialRepo,
-                                  FilamentVariantRepository variantRepo,
-                                  OrcaProfileResolver orcaProfileResolver,
                                   com.printcalculator.repository.PricingPolicyRepository pricingRepo,
-                                  com.printcalculator.service.ClamAVService clamAVService) {
+                                  QuoteSessionTotalsService quoteSessionTotalsService,
+                                  QuoteSessionItemService quoteSessionItemService,
+                                  QuoteStorageService quoteStorageService,
+                                  QuoteSessionResponseAssembler quoteSessionResponseAssembler) {
         this.sessionRepo = sessionRepo;
         this.lineItemRepo = lineItemRepo;
-        this.slicerService = slicerService;
         this.quoteCalculator = quoteCalculator;
-        this.machineRepo = machineRepo;
-        this.materialRepo = materialRepo;
-        this.variantRepo = variantRepo;
-        this.orcaProfileResolver = orcaProfileResolver;
         this.pricingRepo = pricingRepo;
-        this.clamAVService = clamAVService;
+        this.quoteSessionTotalsService = quoteSessionTotalsService;
+        this.quoteSessionItemService = quoteSessionItemService;
+        this.quoteStorageService = quoteStorageService;
+        this.quoteSessionResponseAssembler = quoteSessionResponseAssembler;
     }
 
-    // 1. Start a new empty session
     @PostMapping(value = "")
     @Transactional
     public ResponseEntity<QuoteSession> createSession() {
         QuoteSession session = new QuoteSession();
         session.setStatus("ACTIVE");
         session.setPricingVersion("v1");
-        // Default material/settings will be set when items are added or updated?
-        // For now set safe defaults
-        session.setMaterialCode("PLA"); 
+        session.setMaterialCode("PLA");
         session.setSupportsEnabled(false);
         session.setCreatedAt(OffsetDateTime.now());
-        session.setExpiresAt(OffsetDateTime.now().plusDays(30)); 
-        
+        session.setExpiresAt(OffsetDateTime.now().plusDays(30));
+
         var policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
         session.setSetupCostChf(quoteCalculator.calculateSessionSetupFee(policy));
-        
+
         session = sessionRepo.save(session);
         return ResponseEntity.ok(session);
     }
-    
-    // 2. Add item to existing session
+
     @PostMapping(value = "/{id}/line-items", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Transactional
-    public ResponseEntity<QuoteLineItem> addItemToExistingSession(
-            @PathVariable UUID id,
-            @RequestPart("settings") com.printcalculator.dto.PrintSettingsDto settings,
-            @RequestPart("file") MultipartFile file
-    ) throws IOException {
+    public ResponseEntity<QuoteLineItem> addItemToExistingSession(@PathVariable UUID id,
+                                                                   @RequestPart("settings") PrintSettingsDto settings,
+                                                                   @RequestPart("file") MultipartFile file) throws IOException {
         QuoteSession session = sessionRepo.findById(id)
                 .orElseThrow(() -> new RuntimeException("Session not found"));
 
-        QuoteLineItem item = addItemToSession(session, file, settings);
+        QuoteLineItem item = quoteSessionItemService.addItemToSession(session, file, settings);
         return ResponseEntity.ok(item);
     }
 
-    // Helper to add item
-    private QuoteLineItem addItemToSession(QuoteSession session, MultipartFile file, com.printcalculator.dto.PrintSettingsDto settings) throws IOException {
-        if (file.isEmpty()) throw new IOException("File is empty");
-
-        // Scan for virus
-        clamAVService.scan(file.getInputStream());
-
-        // 1. Define Persistent Storage Path
-        // Structure: storage_quotes/{sessionId}/{uuid}.{ext}
-        Path sessionStorageDir = QUOTE_STORAGE_ROOT.resolve(session.getId().toString()).normalize();
-        if (!sessionStorageDir.startsWith(QUOTE_STORAGE_ROOT)) {
-            throw new IOException("Invalid quote session storage path");
-        }
-        Files.createDirectories(sessionStorageDir);
-
-        String originalFilename = file.getOriginalFilename();
-        String ext = getSafeExtension(originalFilename, "stl");
-        String storedFilename = UUID.randomUUID() + "." + ext;
-        Path persistentPath = sessionStorageDir.resolve(storedFilename).normalize();
-        if (!persistentPath.startsWith(sessionStorageDir)) {
-            throw new IOException("Invalid quote line-item storage path");
-        }
-
-        // Save file
-        try (InputStream inputStream = file.getInputStream()) {
-            Files.copy(inputStream, persistentPath, StandardCopyOption.REPLACE_EXISTING);
-        }
-
-        try {
-            // Apply Basic/Advanced Logic
-            applyPrintSettings(settings);
-
-            BigDecimal nozzleDiameter = BigDecimal.valueOf(settings.getNozzleDiameter() != null ? settings.getNozzleDiameter() : 0.4);
-
-            // Pick machine (selected machine if provided, otherwise first active)
-            PrinterMachine machine = resolvePrinterMachine(settings.getPrinterMachineId());
-
-            // Resolve selected filament variant
-            FilamentVariant selectedVariant = resolveFilamentVariant(settings);
-
-            // Update session global settings from the most recent item added
-            session.setMaterialCode(selectedVariant.getFilamentMaterialType().getMaterialCode());
-            session.setNozzleDiameterMm(nozzleDiameter);
-            session.setLayerHeightMm(BigDecimal.valueOf(settings.getLayerHeight() != null ? settings.getLayerHeight() : 0.2));
-            session.setInfillPattern(settings.getInfillPattern());
-            session.setInfillPercent(settings.getInfillDensity() != null ? settings.getInfillDensity().intValue() : 20);
-            session.setSupportsEnabled(settings.getSupportsEnabled() != null ? settings.getSupportsEnabled() : false);
-            sessionRepo.save(session);
-
-            OrcaProfileResolver.ResolvedProfiles profiles = orcaProfileResolver.resolve(machine, nozzleDiameter, selectedVariant);
-            String machineProfile = profiles.machineProfileName();
-            String filamentProfile = profiles.filamentProfileName();
-
-            String processProfile = "standard";
-            if (settings.getLayerHeight() != null) {
-                 if (settings.getLayerHeight() >= 0.28) processProfile = "draft";
-                 else if (settings.getLayerHeight() <= 0.12) processProfile = "extra_fine";
-            }
-            
-            // Build overrides map from settings
-            Map<String, String> processOverrides = new HashMap<>();
-            if (settings.getLayerHeight() != null) processOverrides.put("layer_height", String.valueOf(settings.getLayerHeight()));
-            if (settings.getInfillDensity() != null) processOverrides.put("sparse_infill_density", settings.getInfillDensity() + "%");
-            if (settings.getInfillPattern() != null) processOverrides.put("sparse_infill_pattern", settings.getInfillPattern());
-            
-            // 3. Slice (Use persistent path)
-            PrintStats stats = slicerService.slice(
-                persistentPath.toFile(), 
-                machineProfile, 
-                filamentProfile, 
-                processProfile, 
-                null, // machine overrides
-                processOverrides
-            );
-
-            Optional<ModelDimensions> modelDimensions = slicerService.inspectModelDimensions(persistentPath.toFile());
-            
-            // 4. Calculate Quote
-            QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), selectedVariant);
-
-            // 5. Create Line Item
-            QuoteLineItem item = new QuoteLineItem();
-            item.setQuoteSession(session);
-            item.setOriginalFilename(file.getOriginalFilename());
-            item.setStoredPath(QUOTE_STORAGE_ROOT.relativize(persistentPath).toString()); // SAVE PATH (relative to root)
-            item.setQuantity(1);
-            item.setColorCode(selectedVariant.getColorName());
-            item.setFilamentVariant(selectedVariant);
-            item.setStatus("READY"); // or CALCULATED
-            
-            item.setPrintTimeSeconds((int) stats.printTimeSeconds());
-            item.setMaterialGrams(BigDecimal.valueOf(stats.filamentWeightGrams()));
-            item.setUnitPriceChf(BigDecimal.valueOf(result.getTotalPrice()));
-            
-            // Store breakdown
-            Map<String, Object> breakdown = new HashMap<>();
-            breakdown.put("machine_cost", result.getTotalPrice()); // Excludes setup fee which is at session level
-            breakdown.put("setup_fee", 0);
-            item.setPricingBreakdown(breakdown);
-            
-            // Dimensions for shipping/package checks are computed server-side from the uploaded model.
-            item.setBoundingBoxXMm(modelDimensions
-                    .map(dim -> BigDecimal.valueOf(dim.xMm()))
-                    .orElseGet(() -> settings.getBoundingBoxX() != null ? BigDecimal.valueOf(settings.getBoundingBoxX()) : BigDecimal.ZERO));
-            item.setBoundingBoxYMm(modelDimensions
-                    .map(dim -> BigDecimal.valueOf(dim.yMm()))
-                    .orElseGet(() -> settings.getBoundingBoxY() != null ? BigDecimal.valueOf(settings.getBoundingBoxY()) : BigDecimal.ZERO));
-            item.setBoundingBoxZMm(modelDimensions
-                    .map(dim -> BigDecimal.valueOf(dim.zMm()))
-                    .orElseGet(() -> settings.getBoundingBoxZ() != null ? BigDecimal.valueOf(settings.getBoundingBoxZ()) : BigDecimal.ZERO));
-            
-            item.setCreatedAt(OffsetDateTime.now());
-            item.setUpdatedAt(OffsetDateTime.now());
-            
-            return lineItemRepo.save(item);
-
-        } catch (Exception e) {
-            // Cleanup if failed
-            Files.deleteIfExists(persistentPath);
-            throw e;
-        }
-    }
-
-    private void applyPrintSettings(com.printcalculator.dto.PrintSettingsDto settings) {
-        if ("BASIC".equalsIgnoreCase(settings.getComplexityMode())) {
-            // Set defaults based on Quality
-            String quality = settings.getQuality() != null ? settings.getQuality().toLowerCase() : "standard";
-            
-            switch (quality) {
-                case "draft":
-                    settings.setLayerHeight(0.28);
-                    settings.setInfillDensity(15.0);
-                    settings.setInfillPattern("grid");
-                    break;
-                case "high":
-                    settings.setLayerHeight(0.12);
-                    settings.setInfillDensity(20.0);
-                    settings.setInfillPattern("gyroid");
-                    break;
-                case "standard":
-                default:
-                    settings.setLayerHeight(0.20);
-                    settings.setInfillDensity(15.0);
-                    settings.setInfillPattern("grid");
-                    break;
-            }
-        } else {
-            // ADVANCED Mode: Use values from Frontend, set defaults if missing
-            if (settings.getLayerHeight() == null) settings.setLayerHeight(0.20);
-            if (settings.getInfillDensity() == null) settings.setInfillDensity(20.0);
-            if (settings.getInfillPattern() == null) settings.setInfillPattern("grid");
-        }
-    }
-
-    private PrinterMachine resolvePrinterMachine(Long printerMachineId) {
-        if (printerMachineId != null) {
-            PrinterMachine selected = machineRepo.findById(printerMachineId)
-                    .orElseThrow(() -> new RuntimeException("Printer machine not found: " + printerMachineId));
-            if (!Boolean.TRUE.equals(selected.getIsActive())) {
-                throw new RuntimeException("Selected printer machine is not active");
-            }
-            return selected;
-        }
-
-        return machineRepo.findFirstByIsActiveTrue()
-                .orElseThrow(() -> new RuntimeException("No active printer found"));
-    }
-
-    private FilamentVariant resolveFilamentVariant(com.printcalculator.dto.PrintSettingsDto settings) {
-        if (settings.getFilamentVariantId() != null) {
-            FilamentVariant variant = variantRepo.findById(settings.getFilamentVariantId())
-                    .orElseThrow(() -> new RuntimeException("Filament variant not found: " + settings.getFilamentVariantId()));
-            if (!Boolean.TRUE.equals(variant.getIsActive())) {
-                throw new RuntimeException("Selected filament variant is not active");
-            }
-            return variant;
-        }
-
-        String requestedMaterialCode = normalizeRequestedMaterialCode(settings.getMaterial());
-
-        FilamentMaterialType materialType = materialRepo.findByMaterialCode(requestedMaterialCode)
-                .orElseGet(() -> materialRepo.findByMaterialCode("PLA")
-                        .orElseThrow(() -> new RuntimeException("Fallback material PLA not configured")));
-
-        String requestedColor = settings.getColor() != null ? settings.getColor().trim() : null;
-        if (requestedColor != null && !requestedColor.isBlank()) {
-            Optional<FilamentVariant> byColor = variantRepo.findByFilamentMaterialTypeAndColorName(materialType, requestedColor);
-            if (byColor.isPresent() && Boolean.TRUE.equals(byColor.get().getIsActive())) {
-                return byColor.get();
-            }
-        }
-
-        return variantRepo.findFirstByFilamentMaterialTypeAndIsActiveTrue(materialType)
-                .orElseThrow(() -> new RuntimeException("No active variant for material: " + requestedMaterialCode));
-    }
-
-    private String normalizeRequestedMaterialCode(String value) {
-        if (value == null || value.isBlank()) {
-            return "PLA";
-        }
-
-        return value.trim()
-                .toUpperCase(Locale.ROOT)
-                .replace('_', ' ')
-                .replace('-', ' ')
-                .replaceAll("\\s+", " ");
-    }
-
-    // 3. Update Line Item
     @PatchMapping("/line-items/{lineItemId}")
     @Transactional
-    public ResponseEntity<QuoteLineItem> updateLineItem(
-            @PathVariable UUID lineItemId,
-            @RequestBody Map<String, Object> updates
-    ) {
+    public ResponseEntity<QuoteLineItem> updateLineItem(@PathVariable UUID lineItemId,
+                                                         @RequestBody Map<String, Object> updates) {
         QuoteLineItem item = lineItemRepo.findById(lineItemId)
                 .orElseThrow(() -> new RuntimeException("Item not found"));
-        
+
+        QuoteSession session = item.getQuoteSession();
+        if ("CONVERTED".equals(session.getStatus())) {
+            throw new ResponseStatusException(BAD_REQUEST, "Cannot modify a converted session");
+        }
+
         if (updates.containsKey("quantity")) {
-            item.setQuantity((Integer) updates.get("quantity"));
+            item.setQuantity(parsePositiveQuantity(updates.get("quantity")));
         }
         if (updates.containsKey("color_code")) {
-            item.setColorCode((String) updates.get("color_code"));
+            Object colorValue = updates.get("color_code");
+            if (colorValue != null) {
+                item.setColorCode(String.valueOf(colorValue));
+            }
         }
-        
-        // Recalculate price if needed? 
-        // For now, unit price is fixed in mock. Total is calculated on GET.
-        
+
         item.setUpdatedAt(OffsetDateTime.now());
         return ResponseEntity.ok(lineItemRepo.save(item));
     }
-    
-    // 4. Delete Line Item
+
     @DeleteMapping("/{sessionId}/line-items/{lineItemId}")
     @Transactional
-    public ResponseEntity<Void> deleteLineItem(
-            @PathVariable UUID sessionId,
-            @PathVariable UUID lineItemId
-    ) {
-        // Verify item belongs to session?
+    public ResponseEntity<Void> deleteLineItem(@PathVariable UUID sessionId,
+                                               @PathVariable UUID lineItemId) {
         QuoteLineItem item = lineItemRepo.findById(lineItemId)
                 .orElseThrow(() -> new RuntimeException("Item not found"));
-        
+
         if (!item.getQuoteSession().getId().equals(sessionId)) {
             return ResponseEntity.badRequest().build();
         }
-        
+
         lineItemRepo.delete(item);
         return ResponseEntity.noContent().build();
     }
-    
-    // 5. Get Session (Session + Items + Total)
+
     @GetMapping("/{id}")
     public ResponseEntity<Map<String, Object>> getQuoteSession(@PathVariable UUID id) {
         QuoteSession session = sessionRepo.findById(id)
                 .orElseThrow(() -> new RuntimeException("Session not found"));
-        
+
         List<QuoteLineItem> items = lineItemRepo.findByQuoteSessionId(id);
-        
-        // Calculate Totals and global session hours
-        BigDecimal itemsTotal = BigDecimal.ZERO;
-        BigDecimal totalSeconds = BigDecimal.ZERO;
-
-        for (QuoteLineItem item : items) {
-            BigDecimal lineTotal = item.getUnitPriceChf().multiply(BigDecimal.valueOf(item.getQuantity()));
-            itemsTotal = itemsTotal.add(lineTotal);
-            
-            if (item.getPrintTimeSeconds() != null) {
-                totalSeconds = totalSeconds.add(BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(item.getQuantity())));
-            }
-        }
-        
-        BigDecimal totalHours = totalSeconds.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
-        com.printcalculator.entity.PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
-        BigDecimal globalMachineCost = quoteCalculator.calculateSessionMachineCost(policy, totalHours);
-        
-        itemsTotal = itemsTotal.add(globalMachineCost);
-        
-        // Map items to DTO to embed distributed machine cost
-        List<Map<String, Object>> itemsDto = new ArrayList<>();
-        for (QuoteLineItem item : items) {
-            Map<String, Object> dto = new HashMap<>();
-            dto.put("id", item.getId());
-            dto.put("originalFilename", item.getOriginalFilename());
-            dto.put("quantity", item.getQuantity());
-            dto.put("printTimeSeconds", item.getPrintTimeSeconds());
-            dto.put("materialGrams", item.getMaterialGrams());
-            dto.put("colorCode", item.getColorCode());
-            dto.put("filamentVariantId", item.getFilamentVariant() != null ? item.getFilamentVariant().getId() : null);
-            dto.put("status", item.getStatus());
-            
-            BigDecimal unitPrice = item.getUnitPriceChf();
-            if (totalSeconds.compareTo(BigDecimal.ZERO) > 0 && item.getPrintTimeSeconds() != null) {
-                BigDecimal itemSeconds = BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(item.getQuantity()));
-                BigDecimal share = itemSeconds.divide(totalSeconds, 8, RoundingMode.HALF_UP);
-                BigDecimal itemMachineCost = globalMachineCost.multiply(share);
-                BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(item.getQuantity()), 2, RoundingMode.HALF_UP);
-                unitPrice = unitPrice.add(unitMachineCost);
-            }
-            dto.put("unitPriceChf", unitPrice);
-            itemsDto.add(dto);
-        }
-        
-        BigDecimal setupFee = session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO;
-        
-        // Calculate shipping cost based on dimensions
-        boolean exceedsBaseSize = false;
-        for (QuoteLineItem item : items) {
-            BigDecimal x = item.getBoundingBoxXMm() != null ? item.getBoundingBoxXMm() : BigDecimal.ZERO;
-            BigDecimal y = item.getBoundingBoxYMm() != null ? item.getBoundingBoxYMm() : BigDecimal.ZERO;
-            BigDecimal z = item.getBoundingBoxZMm() != null ? item.getBoundingBoxZMm() : BigDecimal.ZERO;
-            
-            BigDecimal[] dims = {x, y, z};
-            java.util.Arrays.sort(dims);
-            
-            if (dims[2].compareTo(BigDecimal.valueOf(250.0)) > 0 ||
-                dims[1].compareTo(BigDecimal.valueOf(176.0)) > 0 ||
-                dims[0].compareTo(BigDecimal.valueOf(20.0)) > 0) {
-                exceedsBaseSize = true;
-                break;
-            }
-        }
-        int totalQuantity = items.stream()
-                .mapToInt(i -> i.getQuantity() != null ? i.getQuantity() : 1)
-                .sum();
-
-        BigDecimal shippingCostChf;
-        if (exceedsBaseSize) {
-            shippingCostChf = totalQuantity > 5 ? BigDecimal.valueOf(9.00) : BigDecimal.valueOf(4.00);
-        } else {
-            shippingCostChf = BigDecimal.valueOf(2.00);
-        }
-
-        BigDecimal grandTotal = itemsTotal.add(setupFee).add(shippingCostChf);
-        
-        Map<String, Object> response = new HashMap<>();
-        response.put("session", session);
-        response.put("items", itemsDto);
-        response.put("itemsTotalChf", itemsTotal); // Includes the base cost of all items + the global tiered machine cost
-        response.put("shippingCostChf", shippingCostChf);
-        response.put("globalMachineCostChf", globalMachineCost); // Provide it so frontend knows how much it was (optional now)
-        response.put("grandTotalChf", grandTotal);
-        
-        return ResponseEntity.ok(response);
+        QuoteSessionTotalsService.QuoteSessionTotals totals = quoteSessionTotalsService.compute(session, items);
+        return ResponseEntity.ok(quoteSessionResponseAssembler.assemble(session, items, totals));
     }
 
-    // 6. Download Line Item Content
     @GetMapping(value = "/{sessionId}/line-items/{lineItemId}/content")
-    public ResponseEntity<org.springframework.core.io.Resource> downloadLineItemContent(
-            @PathVariable UUID sessionId,
-            @PathVariable UUID lineItemId
-    ) throws IOException {
+    public ResponseEntity<Resource> downloadLineItemContent(@PathVariable UUID sessionId,
+                                                            @PathVariable UUID lineItemId,
+                                                            @RequestParam(name = "preview", required = false, defaultValue = "false") boolean preview)
+            throws IOException {
         QuoteLineItem item = lineItemRepo.findById(lineItemId)
                 .orElseThrow(() -> new RuntimeException("Item not found"));
 
@@ -477,58 +150,93 @@ public class QuoteSessionController {
             return ResponseEntity.badRequest().build();
         }
 
-        if (item.getStoredPath() == null) {
+        String targetStoredPath = item.getStoredPath();
+        if (preview) {
+            String convertedPath = quoteStorageService.extractConvertedStoredPath(item);
+            if (convertedPath != null && !convertedPath.isBlank()) {
+                targetStoredPath = convertedPath;
+            }
+        }
+
+        if (targetStoredPath == null) {
             return ResponseEntity.notFound().build();
         }
 
-        Path path = resolveStoredQuotePath(item.getStoredPath(), sessionId);
-        if (path == null || !Files.exists(path)) {
+        java.nio.file.Path path = quoteStorageService.resolveStoredQuotePath(targetStoredPath, sessionId);
+        if (path == null || !java.nio.file.Files.exists(path)) {
             return ResponseEntity.notFound().build();
         }
 
-        org.springframework.core.io.Resource resource = new UrlResource(path.toUri());
+        Resource resource = new UrlResource(path.toUri());
+        String downloadName = preview ? path.getFileName().toString() : item.getOriginalFilename();
 
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + item.getOriginalFilename() + "\"")
+                .header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + downloadName + "\"")
                 .body(resource);
     }
 
-    private String getSafeExtension(String filename, String fallback) {
-        if (filename == null) {
-            return fallback;
+    @GetMapping(value = "/{sessionId}/line-items/{lineItemId}/stl-preview")
+    public ResponseEntity<Resource> downloadLineItemStlPreview(@PathVariable UUID sessionId,
+                                                               @PathVariable UUID lineItemId)
+            throws IOException {
+        QuoteLineItem item = lineItemRepo.findById(lineItemId)
+                .orElseThrow(() -> new RuntimeException("Item not found"));
+
+        if (!item.getQuoteSession().getId().equals(sessionId)) {
+            return ResponseEntity.badRequest().build();
         }
-        String cleaned = StringUtils.cleanPath(filename);
-        if (cleaned.contains("..")) {
-            return fallback;
+
+        if (!"stl".equals(quoteStorageService.getSafeExtension(item.getOriginalFilename(), ""))) {
+            return ResponseEntity.notFound().build();
         }
-        int index = cleaned.lastIndexOf('.');
-        if (index <= 0 || index >= cleaned.length() - 1) {
-            return fallback;
+
+        String targetStoredPath = item.getStoredPath();
+        if (targetStoredPath == null || targetStoredPath.isBlank()) {
+            return ResponseEntity.notFound().build();
         }
-        String ext = cleaned.substring(index + 1).toLowerCase(Locale.ROOT);
-        return switch (ext) {
-            case "stl" -> "stl";
-            case "3mf" -> "3mf";
-            case "step", "stp" -> "step";
-            default -> fallback;
-        };
+
+        java.nio.file.Path path = quoteStorageService.resolveStoredQuotePath(targetStoredPath, sessionId);
+        if (path == null || !java.nio.file.Files.exists(path)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        if (!"stl".equals(quoteStorageService.getSafeExtension(path.getFileName().toString(), ""))) {
+            return ResponseEntity.notFound().build();
+        }
+
+        Resource resource = new UrlResource(path.toUri());
+        String downloadName = path.getFileName().toString();
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.parseMediaType("model/stl"))
+                .header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + downloadName + "\"")
+                .body(resource);
     }
 
-    private Path resolveStoredQuotePath(String storedPath, UUID expectedSessionId) {
-        if (storedPath == null || storedPath.isBlank()) {
-            return null;
+    private int parsePositiveQuantity(Object raw) {
+        if (raw == null) {
+            throw new ResponseStatusException(BAD_REQUEST, "Quantity is required");
         }
-        try {
-            Path raw = Path.of(storedPath).normalize();
-            Path resolved = raw.isAbsolute() ? raw : QUOTE_STORAGE_ROOT.resolve(raw).normalize();
-            Path expectedSessionRoot = QUOTE_STORAGE_ROOT.resolve(expectedSessionId.toString()).normalize();
-            if (!resolved.startsWith(expectedSessionRoot)) {
-                return null;
+
+        int quantity;
+        if (raw instanceof Number number) {
+            double numericValue = number.doubleValue();
+            if (!Double.isFinite(numericValue)) {
+                throw new ResponseStatusException(BAD_REQUEST, "Quantity must be a finite number");
+            }
+            quantity = (int) Math.floor(numericValue);
+        } else {
+            try {
+                quantity = Integer.parseInt(String.valueOf(raw).trim());
+            } catch (NumberFormatException ex) {
+                throw new ResponseStatusException(BAD_REQUEST, "Quantity must be an integer");
             }
-            return resolved;
-        } catch (InvalidPathException e) {
-            return null;
         }
+
+        if (quantity < 1) {
+            throw new ResponseStatusException(BAD_REQUEST, "Quantity must be >= 1");
+        }
+        return quantity;
     }
 }

backend/src/main/java/com/printcalculator/controller/admin/AdminOperationsController.java

@@ -3,6 +3,8 @@ package com.printcalculator.controller.admin;
 import com.printcalculator.dto.AdminContactRequestDto;
 import com.printcalculator.dto.AdminContactRequestAttachmentDto;
 import com.printcalculator.dto.AdminContactRequestDetailDto;
+import com.printcalculator.dto.AdminCadInvoiceCreateRequest;
+import com.printcalculator.dto.AdminCadInvoiceDto;
 import com.printcalculator.dto.AdminFilamentStockDto;
 import com.printcalculator.dto.AdminQuoteSessionDto;
 import com.printcalculator.dto.AdminUpdateContactRequestStatusRequest;
@@ -10,13 +12,18 @@ import com.printcalculator.entity.CustomQuoteRequest;
 import com.printcalculator.entity.CustomQuoteRequestAttachment;
 import com.printcalculator.entity.FilamentVariant;
 import com.printcalculator.entity.FilamentVariantStockKg;
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.QuoteLineItem;
 import com.printcalculator.entity.QuoteSession;
 import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
 import com.printcalculator.repository.CustomQuoteRequestRepository;
 import com.printcalculator.repository.FilamentVariantRepository;
 import com.printcalculator.repository.FilamentVariantStockKgRepository;
 import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.PricingPolicyRepository;
+import com.printcalculator.repository.QuoteLineItemRepository;
 import com.printcalculator.repository.QuoteSessionRepository;
+import com.printcalculator.service.QuoteSessionTotalsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
@@ -31,6 +38,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,6 +47,7 @@ import org.springframework.web.server.ResponseStatusException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.MalformedURLException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -75,7 +84,10 @@ public class AdminOperationsController {
     private final CustomQuoteRequestRepository customQuoteRequestRepo;
     private final CustomQuoteRequestAttachmentRepository customQuoteRequestAttachmentRepo;
     private final QuoteSessionRepository quoteSessionRepo;
+    private final QuoteLineItemRepository quoteLineItemRepo;
     private final OrderRepository orderRepo;
+    private final PricingPolicyRepository pricingRepo;
+    private final QuoteSessionTotalsService quoteSessionTotalsService;
 
     public AdminOperationsController(
             FilamentVariantStockKgRepository filamentStockRepo,
@@ -83,14 +95,20 @@ public class AdminOperationsController {
             CustomQuoteRequestRepository customQuoteRequestRepo,
             CustomQuoteRequestAttachmentRepository customQuoteRequestAttachmentRepo,
             QuoteSessionRepository quoteSessionRepo,
-            OrderRepository orderRepo
+            QuoteLineItemRepository quoteLineItemRepo,
+            OrderRepository orderRepo,
+            PricingPolicyRepository pricingRepo,
+            QuoteSessionTotalsService quoteSessionTotalsService
     ) {
         this.filamentStockRepo = filamentStockRepo;
         this.filamentVariantRepo = filamentVariantRepo;
         this.customQuoteRequestRepo = customQuoteRequestRepo;
         this.customQuoteRequestAttachmentRepo = customQuoteRequestAttachmentRepo;
         this.quoteSessionRepo = quoteSessionRepo;
+        this.quoteLineItemRepo = quoteLineItemRepo;
         this.orderRepo = orderRepo;
+        this.pricingRepo = pricingRepo;
+        this.quoteSessionTotalsService = quoteSessionTotalsService;
     }
 
     @GetMapping("/filament-stock")
@@ -279,6 +297,83 @@ public class AdminOperationsController {
         return ResponseEntity.ok(response);
     }
 
+    @GetMapping("/cad-invoices")
+    public ResponseEntity<List<AdminCadInvoiceDto>> getCadInvoices() {
+        List<AdminCadInvoiceDto> response = quoteSessionRepo.findByStatusInOrderByCreatedAtDesc(List.of("CAD_ACTIVE", "CONVERTED"))
+                .stream()
+                .filter(this::isCadSessionRecord)
+                .map(this::toCadInvoiceDto)
+                .toList();
+        return ResponseEntity.ok(response);
+    }
+
+    @PostMapping("/cad-invoices")
+    @Transactional
+    public ResponseEntity<AdminCadInvoiceDto> createOrUpdateCadInvoice(
+            @RequestBody AdminCadInvoiceCreateRequest payload
+    ) {
+        if (payload == null || payload.getCadHours() == null) {
+            throw new ResponseStatusException(BAD_REQUEST, "cadHours is required");
+        }
+
+        BigDecimal cadHours = payload.getCadHours().setScale(2, RoundingMode.HALF_UP);
+        if (cadHours.compareTo(BigDecimal.ZERO) <= 0) {
+            throw new ResponseStatusException(BAD_REQUEST, "cadHours must be > 0");
+        }
+
+        BigDecimal cadRate = payload.getCadHourlyRateChf();
+        if (cadRate == null || cadRate.compareTo(BigDecimal.ZERO) <= 0) {
+            var policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
+            cadRate = policy != null && policy.getCadCostChfPerHour() != null
+                    ? policy.getCadCostChfPerHour()
+                    : BigDecimal.ZERO;
+        }
+        cadRate = cadRate.setScale(2, RoundingMode.HALF_UP);
+
+        QuoteSession session;
+        if (payload.getSessionId() != null) {
+            session = quoteSessionRepo.findById(payload.getSessionId())
+                    .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Session not found"));
+        } else {
+            session = new QuoteSession();
+            session.setStatus("CAD_ACTIVE");
+            session.setPricingVersion("v1");
+            session.setMaterialCode("PLA");
+            session.setNozzleDiameterMm(BigDecimal.valueOf(0.4));
+            session.setLayerHeightMm(BigDecimal.valueOf(0.2));
+            session.setInfillPattern("grid");
+            session.setInfillPercent(20);
+            session.setSupportsEnabled(false);
+            session.setSetupCostChf(BigDecimal.ZERO);
+            session.setCreatedAt(OffsetDateTime.now());
+            session.setExpiresAt(OffsetDateTime.now().plusDays(30));
+        }
+
+        if ("CONVERTED".equals(session.getStatus())) {
+            throw new ResponseStatusException(CONFLICT, "Session already converted to order");
+        }
+
+        if (payload.getSourceRequestId() != null) {
+            if (!customQuoteRequestRepo.existsById(payload.getSourceRequestId())) {
+                throw new ResponseStatusException(NOT_FOUND, "Source request not found");
+            }
+            session.setSourceRequestId(payload.getSourceRequestId());
+        } else {
+            session.setSourceRequestId(null);
+        }
+
+        session.setStatus("CAD_ACTIVE");
+        session.setCadHours(cadHours);
+        session.setCadHourlyRateChf(cadRate);
+        if (payload.getNotes() != null) {
+            String trimmedNotes = payload.getNotes().trim();
+            session.setNotes(trimmedNotes.isEmpty() ? null : trimmedNotes);
+        }
+
+        QuoteSession saved = quoteSessionRepo.save(session);
+        return ResponseEntity.ok(toCadInvoiceDto(saved));
+    }
+
     @DeleteMapping("/sessions/{sessionId}")
     @Transactional
     public ResponseEntity<Void> deleteQuoteSession(@PathVariable UUID sessionId) {
@@ -347,6 +442,48 @@ public class AdminOperationsController {
         dto.setCreatedAt(session.getCreatedAt());
         dto.setExpiresAt(session.getExpiresAt());
         dto.setConvertedOrderId(session.getConvertedOrderId());
+        dto.setSourceRequestId(session.getSourceRequestId());
+        dto.setCadHours(session.getCadHours());
+        dto.setCadHourlyRateChf(session.getCadHourlyRateChf());
+        dto.setCadTotalChf(quoteSessionTotalsService.calculateCadTotal(session));
+        return dto;
+    }
+
+    private boolean isCadSessionRecord(QuoteSession session) {
+        if ("CAD_ACTIVE".equals(session.getStatus())) {
+            return true;
+        }
+        if (!"CONVERTED".equals(session.getStatus())) {
+            return false;
+        }
+        BigDecimal cadHours = session.getCadHours() != null ? session.getCadHours() : BigDecimal.ZERO;
+        return cadHours.compareTo(BigDecimal.ZERO) > 0 || session.getSourceRequestId() != null;
+    }
+
+    private AdminCadInvoiceDto toCadInvoiceDto(QuoteSession session) {
+        List<QuoteLineItem> items = quoteLineItemRepo.findByQuoteSessionId(session.getId());
+        QuoteSessionTotalsService.QuoteSessionTotals totals = quoteSessionTotalsService.compute(session, items);
+
+        AdminCadInvoiceDto dto = new AdminCadInvoiceDto();
+        dto.setSessionId(session.getId());
+        dto.setSessionStatus(session.getStatus());
+        dto.setSourceRequestId(session.getSourceRequestId());
+        dto.setCadHours(session.getCadHours() != null ? session.getCadHours() : BigDecimal.ZERO);
+        dto.setCadHourlyRateChf(session.getCadHourlyRateChf() != null ? session.getCadHourlyRateChf() : BigDecimal.ZERO);
+        dto.setCadTotalChf(totals.cadTotalChf());
+        dto.setPrintItemsTotalChf(totals.printItemsTotalChf());
+        dto.setSetupCostChf(totals.setupCostChf());
+        dto.setShippingCostChf(totals.shippingCostChf());
+        dto.setGrandTotalChf(totals.grandTotalChf());
+        dto.setConvertedOrderId(session.getConvertedOrderId());
+        dto.setCheckoutPath("/checkout/cad?session=" + session.getId());
+        dto.setNotes(session.getNotes());
+        dto.setCreatedAt(session.getCreatedAt());
+
+        if (session.getConvertedOrderId() != null) {
+            Order order = orderRepo.findById(session.getConvertedOrderId()).orElse(null);
+            dto.setConvertedOrderStatus(order != null ? order.getStatus() : null);
+        }
         return dto;
     }
 

backend/src/main/java/com/printcalculator/controller/admin/AdminOrderController.java

@@ -1,24 +1,9 @@
 package com.printcalculator.controller.admin;
 
-import com.printcalculator.dto.AddressDto;
 import com.printcalculator.dto.AdminOrderStatusUpdateRequest;
 import com.printcalculator.dto.OrderDto;
-import com.printcalculator.dto.OrderItemDto;
-import com.printcalculator.entity.Order;
-import com.printcalculator.entity.OrderItem;
-import com.printcalculator.entity.Payment;
-import com.printcalculator.entity.QuoteSession;
-import com.printcalculator.repository.OrderItemRepository;
-import com.printcalculator.repository.OrderRepository;
-import com.printcalculator.repository.PaymentRepository;
-import com.printcalculator.service.InvoicePdfRenderingService;
-import com.printcalculator.service.PaymentService;
-import com.printcalculator.service.QrBillService;
-import com.printcalculator.service.StorageService;
+import com.printcalculator.service.order.AdminOrderControllerService;
 import org.springframework.core.io.Resource;
-import org.springframework.http.ContentDisposition;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,83 +12,39 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-
 @RestController
 @RequestMapping("/api/admin/orders")
 @Transactional(readOnly = true)
 public class AdminOrderController {
-    private static final List<String> ALLOWED_ORDER_STATUSES = List.of(
-            "PENDING_PAYMENT",
-            "PAID",
-            "IN_PRODUCTION",
-            "SHIPPED",
-            "COMPLETED",
-            "CANCELLED"
-    );
 
-    private final OrderRepository orderRepo;
-    private final OrderItemRepository orderItemRepo;
-    private final PaymentRepository paymentRepo;
-    private final PaymentService paymentService;
-    private final StorageService storageService;
-    private final InvoicePdfRenderingService invoiceService;
-    private final QrBillService qrBillService;
+    private final AdminOrderControllerService adminOrderControllerService;
 
-    public AdminOrderController(
-            OrderRepository orderRepo,
-            OrderItemRepository orderItemRepo,
-            PaymentRepository paymentRepo,
-            PaymentService paymentService,
-            StorageService storageService,
-            InvoicePdfRenderingService invoiceService,
-            QrBillService qrBillService
-    ) {
-        this.orderRepo = orderRepo;
-        this.orderItemRepo = orderItemRepo;
-        this.paymentRepo = paymentRepo;
-        this.paymentService = paymentService;
-        this.storageService = storageService;
-        this.invoiceService = invoiceService;
-        this.qrBillService = qrBillService;
+    public AdminOrderController(AdminOrderControllerService adminOrderControllerService) {
+        this.adminOrderControllerService = adminOrderControllerService;
     }
 
     @GetMapping
     public ResponseEntity<List<OrderDto>> listOrders() {
-        List<OrderDto> response = orderRepo.findAllByOrderByCreatedAtDesc()
-                .stream()
-                .map(this::toOrderDto)
-                .toList();
-        return ResponseEntity.ok(response);
+        return ResponseEntity.ok(adminOrderControllerService.listOrders());
     }
 
     @GetMapping("/{orderId}")
     public ResponseEntity<OrderDto> getOrder(@PathVariable UUID orderId) {
-        return ResponseEntity.ok(toOrderDto(getOrderOrThrow(orderId)));
+        return ResponseEntity.ok(adminOrderControllerService.getOrder(orderId));
     }
 
     @PostMapping("/{orderId}/payments/confirm")
     @Transactional
-    public ResponseEntity<OrderDto> confirmPayment(
+    public ResponseEntity<OrderDto> updatePaymentMethod(
             @PathVariable UUID orderId,
             @RequestBody(required = false) Map<String, String> payload
     ) {
-        getOrderOrThrow(orderId);
-        String method = payload != null ? payload.get("method") : null;
-        paymentService.confirmPayment(orderId, method);
-        return ResponseEntity.ok(toOrderDto(getOrderOrThrow(orderId)));
+        return ResponseEntity.ok(adminOrderControllerService.updatePaymentMethod(orderId, payload));
     }
 
     @PostMapping("/{orderId}/status")
@@ -112,22 +53,7 @@ public class AdminOrderController {
             @PathVariable UUID orderId,
             @RequestBody AdminOrderStatusUpdateRequest payload
     ) {
-        if (payload == null || payload.getStatus() == null || payload.getStatus().isBlank()) {
-            throw new ResponseStatusException(org.springframework.http.HttpStatus.BAD_REQUEST, "Status is required");
-        }
-
-        Order order = getOrderOrThrow(orderId);
-        String normalizedStatus = payload.getStatus().trim().toUpperCase(Locale.ROOT);
-        if (!ALLOWED_ORDER_STATUSES.contains(normalizedStatus)) {
-            throw new ResponseStatusException(
-                    BAD_REQUEST,
-                    "Invalid order status. Allowed values: " + String.join(", ", ALLOWED_ORDER_STATUSES)
-            );
-        }
-        order.setStatus(normalizedStatus);
-        orderRepo.save(order);
-
-        return ResponseEntity.ok(toOrderDto(order));
+        return ResponseEntity.ok(adminOrderControllerService.updateOrderStatus(orderId, payload));
     }
 
     @GetMapping("/{orderId}/items/{orderItemId}/file")
@@ -135,193 +61,16 @@ public class AdminOrderController {
             @PathVariable UUID orderId,
             @PathVariable UUID orderItemId
     ) {
-        OrderItem item = orderItemRepo.findById(orderItemId)
-                .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order item not found"));
-
-        if (!item.getOrder().getId().equals(orderId)) {
-            throw new ResponseStatusException(NOT_FOUND, "Order item not found for order");
-        }
-
-        String relativePath = item.getStoredRelativePath();
-        if (relativePath == null || relativePath.isBlank() || "PENDING".equals(relativePath)) {
-            throw new ResponseStatusException(NOT_FOUND, "File not available");
-        }
-        Path safeRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
-        if (safeRelativePath == null) {
-            throw new ResponseStatusException(NOT_FOUND, "File not available");
-        }
-
-        try {
-            Resource resource = storageService.loadAsResource(safeRelativePath);
-            MediaType contentType = MediaType.APPLICATION_OCTET_STREAM;
-            if (item.getMimeType() != null && !item.getMimeType().isBlank()) {
-                try {
-                    contentType = MediaType.parseMediaType(item.getMimeType());
-                } catch (Exception ignored) {
-                    contentType = MediaType.APPLICATION_OCTET_STREAM;
-                }
-            }
-
-            String filename = item.getOriginalFilename() != null && !item.getOriginalFilename().isBlank()
-                    ? item.getOriginalFilename()
-                    : "order-item-" + orderItemId;
-
-            return ResponseEntity.ok()
-                    .contentType(contentType)
-                    .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment()
-                            .filename(filename, StandardCharsets.UTF_8)
-                            .build()
-                            .toString())
-                    .body(resource);
-        } catch (Exception e) {
-            throw new ResponseStatusException(NOT_FOUND, "File not available");
-        }
+        return adminOrderControllerService.downloadOrderItemFile(orderId, orderItemId);
     }
 
     @GetMapping("/{orderId}/documents/confirmation")
     public ResponseEntity<byte[]> downloadOrderConfirmation(@PathVariable UUID orderId) {
-        return generateDocument(getOrderOrThrow(orderId), true);
+        return adminOrderControllerService.downloadOrderConfirmation(orderId);
     }
 
     @GetMapping("/{orderId}/documents/invoice")
     public ResponseEntity<byte[]> downloadOrderInvoice(@PathVariable UUID orderId) {
-        return generateDocument(getOrderOrThrow(orderId), false);
-    }
-
-    private Order getOrderOrThrow(UUID orderId) {
-        return orderRepo.findById(orderId)
-                .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order not found"));
-    }
-
-    private OrderDto toOrderDto(Order order) {
-        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
-        OrderDto dto = new OrderDto();
-        dto.setId(order.getId());
-        dto.setOrderNumber(getDisplayOrderNumber(order));
-        dto.setStatus(order.getStatus());
-
-        paymentRepo.findByOrder_Id(order.getId()).ifPresent(p -> {
-            dto.setPaymentStatus(p.getStatus());
-            dto.setPaymentMethod(p.getMethod());
-        });
-
-        dto.setCustomerEmail(order.getCustomerEmail());
-        dto.setCustomerPhone(order.getCustomerPhone());
-        dto.setPreferredLanguage(order.getPreferredLanguage());
-        dto.setBillingCustomerType(order.getBillingCustomerType());
-        dto.setCurrency(order.getCurrency());
-        dto.setSetupCostChf(order.getSetupCostChf());
-        dto.setShippingCostChf(order.getShippingCostChf());
-        dto.setDiscountChf(order.getDiscountChf());
-        dto.setSubtotalChf(order.getSubtotalChf());
-        dto.setTotalChf(order.getTotalChf());
-        dto.setCreatedAt(order.getCreatedAt());
-        dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
-        QuoteSession sourceSession = order.getSourceQuoteSession();
-        if (sourceSession != null) {
-            dto.setPrintMaterialCode(sourceSession.getMaterialCode());
-            dto.setPrintNozzleDiameterMm(sourceSession.getNozzleDiameterMm());
-            dto.setPrintLayerHeightMm(sourceSession.getLayerHeightMm());
-            dto.setPrintInfillPattern(sourceSession.getInfillPattern());
-            dto.setPrintInfillPercent(sourceSession.getInfillPercent());
-            dto.setPrintSupportsEnabled(sourceSession.getSupportsEnabled());
-        }
-
-        AddressDto billing = new AddressDto();
-        billing.setFirstName(order.getBillingFirstName());
-        billing.setLastName(order.getBillingLastName());
-        billing.setCompanyName(order.getBillingCompanyName());
-        billing.setContactPerson(order.getBillingContactPerson());
-        billing.setAddressLine1(order.getBillingAddressLine1());
-        billing.setAddressLine2(order.getBillingAddressLine2());
-        billing.setZip(order.getBillingZip());
-        billing.setCity(order.getBillingCity());
-        billing.setCountryCode(order.getBillingCountryCode());
-        dto.setBillingAddress(billing);
-
-        if (!Boolean.TRUE.equals(order.getShippingSameAsBilling())) {
-            AddressDto shipping = new AddressDto();
-            shipping.setFirstName(order.getShippingFirstName());
-            shipping.setLastName(order.getShippingLastName());
-            shipping.setCompanyName(order.getShippingCompanyName());
-            shipping.setContactPerson(order.getShippingContactPerson());
-            shipping.setAddressLine1(order.getShippingAddressLine1());
-            shipping.setAddressLine2(order.getShippingAddressLine2());
-            shipping.setZip(order.getShippingZip());
-            shipping.setCity(order.getShippingCity());
-            shipping.setCountryCode(order.getShippingCountryCode());
-            dto.setShippingAddress(shipping);
-        }
-
-        List<OrderItemDto> itemDtos = items.stream().map(i -> {
-            OrderItemDto idto = new OrderItemDto();
-            idto.setId(i.getId());
-            idto.setOriginalFilename(i.getOriginalFilename());
-            idto.setMaterialCode(i.getMaterialCode());
-            idto.setColorCode(i.getColorCode());
-            idto.setQuantity(i.getQuantity());
-            idto.setPrintTimeSeconds(i.getPrintTimeSeconds());
-            idto.setMaterialGrams(i.getMaterialGrams());
-            idto.setUnitPriceChf(i.getUnitPriceChf());
-            idto.setLineTotalChf(i.getLineTotalChf());
-            return idto;
-        }).toList();
-        dto.setItems(itemDtos);
-
-        return dto;
-    }
-
-    private String getDisplayOrderNumber(Order order) {
-        String orderNumber = order.getOrderNumber();
-        if (orderNumber != null && !orderNumber.isBlank()) {
-            return orderNumber;
-        }
-        return order.getId() != null ? order.getId().toString() : "unknown";
-    }
-
-    private ResponseEntity<byte[]> generateDocument(Order order, boolean isConfirmation) {
-        String displayOrderNumber = getDisplayOrderNumber(order);
-        if (isConfirmation) {
-            Path relativePath = buildConfirmationPdfRelativePath(order.getId(), displayOrderNumber);
-            try {
-                byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
-                return ResponseEntity.ok()
-                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"confirmation-" + displayOrderNumber + ".pdf\"")
-                        .contentType(MediaType.APPLICATION_PDF)
-                        .body(existingPdf);
-            } catch (Exception ignored) {
-                // fallback to generated confirmation document
-            }
-        }
-
-        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
-        Payment payment = paymentRepo.findByOrder_Id(order.getId()).orElse(null);
-        byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
-
-        String prefix = isConfirmation ? "confirmation-" : "invoice-";
-        return ResponseEntity.ok()
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + prefix + displayOrderNumber + ".pdf\"")
-                .contentType(MediaType.APPLICATION_PDF)
-                .body(pdf);
-    }
-
-    private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
-        try {
-            Path candidate = Path.of(storedRelativePath).normalize();
-            if (candidate.isAbsolute()) {
-                return null;
-            }
-            Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
-            if (!candidate.startsWith(expectedPrefix)) {
-                return null;
-            }
-            return candidate;
-        } catch (InvalidPathException e) {
-            return null;
-        }
-    }
-
-    private Path buildConfirmationPdfRelativePath(UUID orderId, String orderNumber) {
-        return Path.of("orders", orderId.toString(), "documents", "confirmation-" + orderNumber + ".pdf");
+        return adminOrderControllerService.downloadOrderInvoice(orderId);
     }
 }

backend/src/main/java/com/printcalculator/dto/AdminCadInvoiceCreateRequest.java

@@ -0,0 +1,52 @@
+package com.printcalculator.dto;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+public class AdminCadInvoiceCreateRequest {
+    private UUID sessionId;
+    private UUID sourceRequestId;
+    private BigDecimal cadHours;
+    private BigDecimal cadHourlyRateChf;
+    private String notes;
+
+    public UUID getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(UUID sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public UUID getSourceRequestId() {
+        return sourceRequestId;
+    }
+
+    public void setSourceRequestId(UUID sourceRequestId) {
+        this.sourceRequestId = sourceRequestId;
+    }
+
+    public BigDecimal getCadHours() {
+        return cadHours;
+    }
+
+    public void setCadHours(BigDecimal cadHours) {
+        this.cadHours = cadHours;
+    }
+
+    public BigDecimal getCadHourlyRateChf() {
+        return cadHourlyRateChf;
+    }
+
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
+        this.cadHourlyRateChf = cadHourlyRateChf;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+}

backend/src/main/java/com/printcalculator/dto/AdminCadInvoiceDto.java

@@ -0,0 +1,143 @@
+package com.printcalculator.dto;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+public class AdminCadInvoiceDto {
+    private UUID sessionId;
+    private String sessionStatus;
+    private UUID sourceRequestId;
+    private BigDecimal cadHours;
+    private BigDecimal cadHourlyRateChf;
+    private BigDecimal cadTotalChf;
+    private BigDecimal printItemsTotalChf;
+    private BigDecimal setupCostChf;
+    private BigDecimal shippingCostChf;
+    private BigDecimal grandTotalChf;
+    private UUID convertedOrderId;
+    private String convertedOrderStatus;
+    private String checkoutPath;
+    private String notes;
+    private OffsetDateTime createdAt;
+
+    public UUID getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(UUID sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public String getSessionStatus() {
+        return sessionStatus;
+    }
+
+    public void setSessionStatus(String sessionStatus) {
+        this.sessionStatus = sessionStatus;
+    }
+
+    public UUID getSourceRequestId() {
+        return sourceRequestId;
+    }
+
+    public void setSourceRequestId(UUID sourceRequestId) {
+        this.sourceRequestId = sourceRequestId;
+    }
+
+    public BigDecimal getCadHours() {
+        return cadHours;
+    }
+
+    public void setCadHours(BigDecimal cadHours) {
+        this.cadHours = cadHours;
+    }
+
+    public BigDecimal getCadHourlyRateChf() {
+        return cadHourlyRateChf;
+    }
+
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
+        this.cadHourlyRateChf = cadHourlyRateChf;
+    }
+
+    public BigDecimal getCadTotalChf() {
+        return cadTotalChf;
+    }
+
+    public void setCadTotalChf(BigDecimal cadTotalChf) {
+        this.cadTotalChf = cadTotalChf;
+    }
+
+    public BigDecimal getPrintItemsTotalChf() {
+        return printItemsTotalChf;
+    }
+
+    public void setPrintItemsTotalChf(BigDecimal printItemsTotalChf) {
+        this.printItemsTotalChf = printItemsTotalChf;
+    }
+
+    public BigDecimal getSetupCostChf() {
+        return setupCostChf;
+    }
+
+    public void setSetupCostChf(BigDecimal setupCostChf) {
+        this.setupCostChf = setupCostChf;
+    }
+
+    public BigDecimal getShippingCostChf() {
+        return shippingCostChf;
+    }
+
+    public void setShippingCostChf(BigDecimal shippingCostChf) {
+        this.shippingCostChf = shippingCostChf;
+    }
+
+    public BigDecimal getGrandTotalChf() {
+        return grandTotalChf;
+    }
+
+    public void setGrandTotalChf(BigDecimal grandTotalChf) {
+        this.grandTotalChf = grandTotalChf;
+    }
+
+    public UUID getConvertedOrderId() {
+        return convertedOrderId;
+    }
+
+    public void setConvertedOrderId(UUID convertedOrderId) {
+        this.convertedOrderId = convertedOrderId;
+    }
+
+    public String getConvertedOrderStatus() {
+        return convertedOrderStatus;
+    }
+
+    public void setConvertedOrderStatus(String convertedOrderStatus) {
+        this.convertedOrderStatus = convertedOrderStatus;
+    }
+
+    public String getCheckoutPath() {
+        return checkoutPath;
+    }
+
+    public void setCheckoutPath(String checkoutPath) {
+        this.checkoutPath = checkoutPath;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+}

backend/src/main/java/com/printcalculator/dto/AdminQuoteSessionDto.java

@@ -1,6 +1,7 @@
 package com.printcalculator.dto;
 
 import java.time.OffsetDateTime;
+import java.math.BigDecimal;
 import java.util.UUID;
 
 public class AdminQuoteSessionDto {
@@ -10,6 +11,10 @@ public class AdminQuoteSessionDto {
     private OffsetDateTime createdAt;
     private OffsetDateTime expiresAt;
     private UUID convertedOrderId;
+    private UUID sourceRequestId;
+    private BigDecimal cadHours;
+    private BigDecimal cadHourlyRateChf;
+    private BigDecimal cadTotalChf;
 
     public UUID getId() {
         return id;
@@ -58,4 +63,36 @@ public class AdminQuoteSessionDto {
     public void setConvertedOrderId(UUID convertedOrderId) {
         this.convertedOrderId = convertedOrderId;
     }
+
+    public UUID getSourceRequestId() {
+        return sourceRequestId;
+    }
+
+    public void setSourceRequestId(UUID sourceRequestId) {
+        this.sourceRequestId = sourceRequestId;
+    }
+
+    public BigDecimal getCadHours() {
+        return cadHours;
+    }
+
+    public void setCadHours(BigDecimal cadHours) {
+        this.cadHours = cadHours;
+    }
+
+    public BigDecimal getCadHourlyRateChf() {
+        return cadHourlyRateChf;
+    }
+
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
+        this.cadHourlyRateChf = cadHourlyRateChf;
+    }
+
+    public BigDecimal getCadTotalChf() {
+        return cadTotalChf;
+    }
+
+    public void setCadTotalChf(BigDecimal cadTotalChf) {
+        this.cadTotalChf = cadTotalChf;
+    }
 }

backend/src/main/java/com/printcalculator/dto/OptionsResponse.java

@@ -7,7 +7,8 @@ public record OptionsResponse(
     List<QualityOption> qualities,
     List<InfillPatternOption> infillPatterns,
     List<LayerHeightOptionDTO> layerHeights,
-    List<NozzleOptionDTO> nozzleDiameters
+    List<NozzleOptionDTO> nozzleDiameters,
+    List<NozzleLayerHeightOptionsDTO> layerHeightsByNozzle
 ) {
     public record MaterialOption(String code, String label, List<VariantOption> variants) {}
     public record VariantOption(
@@ -24,4 +25,5 @@ public record OptionsResponse(
     public record InfillPatternOption(String id, String label) {}
     public record LayerHeightOptionDTO(double value, String label) {}
     public record NozzleOptionDTO(double value, String label) {}
+    public record NozzleLayerHeightOptionsDTO(double nozzleDiameter, List<LayerHeightOptionDTO> layerHeights) {}
 }

backend/src/main/java/com/printcalculator/dto/OrderDto.java

@@ -23,6 +23,11 @@ public class OrderDto {
     private BigDecimal shippingCostChf;
     private BigDecimal discountChf;
     private BigDecimal subtotalChf;
+    private Boolean isCadOrder;
+    private UUID sourceRequestId;
+    private BigDecimal cadHours;
+    private BigDecimal cadHourlyRateChf;
+    private BigDecimal cadTotalChf;
     private BigDecimal totalChf;
     private OffsetDateTime createdAt;
     private String printMaterialCode;
@@ -85,6 +90,21 @@ public class OrderDto {
     public BigDecimal getSubtotalChf() { return subtotalChf; }
     public void setSubtotalChf(BigDecimal subtotalChf) { this.subtotalChf = subtotalChf; }
 
+    public Boolean getIsCadOrder() { return isCadOrder; }
+    public void setIsCadOrder(Boolean isCadOrder) { this.isCadOrder = isCadOrder; }
+
+    public UUID getSourceRequestId() { return sourceRequestId; }
+    public void setSourceRequestId(UUID sourceRequestId) { this.sourceRequestId = sourceRequestId; }
+
+    public BigDecimal getCadHours() { return cadHours; }
+    public void setCadHours(BigDecimal cadHours) { this.cadHours = cadHours; }
+
+    public BigDecimal getCadHourlyRateChf() { return cadHourlyRateChf; }
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) { this.cadHourlyRateChf = cadHourlyRateChf; }
+
+    public BigDecimal getCadTotalChf() { return cadTotalChf; }
+    public void setCadTotalChf(BigDecimal cadTotalChf) { this.cadTotalChf = cadTotalChf; }
+
     public BigDecimal getTotalChf() { return totalChf; }
     public void setTotalChf(BigDecimal totalChf) { this.totalChf = totalChf; }
 

backend/src/main/java/com/printcalculator/dto/OrderItemDto.java

@@ -8,6 +8,12 @@ public class OrderItemDto {
     private String originalFilename;
     private String materialCode;
     private String colorCode;
+    private String quality;
+    private BigDecimal nozzleDiameterMm;
+    private BigDecimal layerHeightMm;
+    private Integer infillPercent;
+    private String infillPattern;
+    private Boolean supportsEnabled;
     private Integer quantity;
     private Integer printTimeSeconds;
     private BigDecimal materialGrams;
@@ -27,6 +33,24 @@ public class OrderItemDto {
     public String getColorCode() { return colorCode; }
     public void setColorCode(String colorCode) { this.colorCode = colorCode; }
 
+    public String getQuality() { return quality; }
+    public void setQuality(String quality) { this.quality = quality; }
+
+    public BigDecimal getNozzleDiameterMm() { return nozzleDiameterMm; }
+    public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) { this.nozzleDiameterMm = nozzleDiameterMm; }
+
+    public BigDecimal getLayerHeightMm() { return layerHeightMm; }
+    public void setLayerHeightMm(BigDecimal layerHeightMm) { this.layerHeightMm = layerHeightMm; }
+
+    public Integer getInfillPercent() { return infillPercent; }
+    public void setInfillPercent(Integer infillPercent) { this.infillPercent = infillPercent; }
+
+    public String getInfillPattern() { return infillPattern; }
+    public void setInfillPattern(String infillPattern) { this.infillPattern = infillPattern; }
+
+    public Boolean getSupportsEnabled() { return supportsEnabled; }
+    public void setSupportsEnabled(Boolean supportsEnabled) { this.supportsEnabled = supportsEnabled; }
+
     public Integer getQuantity() { return quantity; }
     public void setQuantity(Integer quantity) { this.quantity = quantity; }
 

backend/src/main/java/com/printcalculator/dto/PrintSettingsDto.java

@@ -1,8 +1,5 @@
 package com.printcalculator.dto;
 
-import lombok.Data;
-
-@Data
 public class PrintSettingsDto {
     // Mode: "BASIC" or "ADVANCED"
     private String complexityMode;
@@ -28,4 +25,124 @@ public class PrintSettingsDto {
     private Double boundingBoxX;
     private Double boundingBoxY;
     private Double boundingBoxZ;
+
+    public String getComplexityMode() {
+        return complexityMode;
+    }
+
+    public void setComplexityMode(String complexityMode) {
+        this.complexityMode = complexityMode;
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public Long getFilamentVariantId() {
+        return filamentVariantId;
+    }
+
+    public void setFilamentVariantId(Long filamentVariantId) {
+        this.filamentVariantId = filamentVariantId;
+    }
+
+    public Long getPrinterMachineId() {
+        return printerMachineId;
+    }
+
+    public void setPrinterMachineId(Long printerMachineId) {
+        this.printerMachineId = printerMachineId;
+    }
+
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
+    public Double getNozzleDiameter() {
+        return nozzleDiameter;
+    }
+
+    public void setNozzleDiameter(Double nozzleDiameter) {
+        this.nozzleDiameter = nozzleDiameter;
+    }
+
+    public Double getLayerHeight() {
+        return layerHeight;
+    }
+
+    public void setLayerHeight(Double layerHeight) {
+        this.layerHeight = layerHeight;
+    }
+
+    public Double getInfillDensity() {
+        return infillDensity;
+    }
+
+    public void setInfillDensity(Double infillDensity) {
+        this.infillDensity = infillDensity;
+    }
+
+    public String getInfillPattern() {
+        return infillPattern;
+    }
+
+    public void setInfillPattern(String infillPattern) {
+        this.infillPattern = infillPattern;
+    }
+
+    public Boolean getSupportsEnabled() {
+        return supportsEnabled;
+    }
+
+    public void setSupportsEnabled(Boolean supportsEnabled) {
+        this.supportsEnabled = supportsEnabled;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public Double getBoundingBoxX() {
+        return boundingBoxX;
+    }
+
+    public void setBoundingBoxX(Double boundingBoxX) {
+        this.boundingBoxX = boundingBoxX;
+    }
+
+    public Double getBoundingBoxY() {
+        return boundingBoxY;
+    }
+
+    public void setBoundingBoxY(Double boundingBoxY) {
+        this.boundingBoxY = boundingBoxY;
+    }
+
+    public Double getBoundingBoxZ() {
+        return boundingBoxZ;
+    }
+
+    public void setBoundingBoxZ(Double boundingBoxZ) {
+        this.boundingBoxZ = boundingBoxZ;
+    }
 }

backend/src/main/java/com/printcalculator/dto/QuoteRequestDto.java

@@ -7,6 +7,7 @@ import jakarta.validation.constraints.AssertTrue;
 public class QuoteRequestDto {
     private String requestType; // "PRINT_SERVICE" or "DESIGN_SERVICE"
     private String customerType; // "PRIVATE" or "BUSINESS"
+    private String language; // "it" | "en" | "de" | "fr"
     private String email;
     private String phone;
     private String name;

backend/src/main/java/com/printcalculator/entity/NozzleLayerHeightOption.java

@@ -0,0 +1,63 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.math.BigDecimal;
+
+@Entity
+@Table(
+        name = "nozzle_layer_height_option",
+        uniqueConstraints = @UniqueConstraint(
+                name = "ux_nozzle_layer_height_option_nozzle_layer",
+                columnNames = {"nozzle_diameter_mm", "layer_height_mm"}
+        )
+)
+public class NozzleLayerHeightOption {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "nozzle_layer_height_option_id", nullable = false)
+    private Long id;
+
+    @Column(name = "nozzle_diameter_mm", nullable = false, precision = 4, scale = 2)
+    private BigDecimal nozzleDiameterMm;
+
+    @Column(name = "layer_height_mm", nullable = false, precision = 5, scale = 3)
+    private BigDecimal layerHeightMm;
+
+    @ColumnDefault("true")
+    @Column(name = "is_active", nullable = false)
+    private Boolean isActive;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public BigDecimal getNozzleDiameterMm() {
+        return nozzleDiameterMm;
+    }
+
+    public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) {
+        this.nozzleDiameterMm = nozzleDiameterMm;
+    }
+
+    public BigDecimal getLayerHeightMm() {
+        return layerHeightMm;
+    }
+
+    public void setLayerHeightMm(BigDecimal layerHeightMm) {
+        this.layerHeightMm = layerHeightMm;
+    }
+
+    public Boolean getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
+    }
+}

backend/src/main/java/com/printcalculator/entity/Order.java

@@ -119,6 +119,23 @@ public class Order {
     @Column(name = "subtotal_chf", nullable = false, precision = 12, scale = 2)
     private BigDecimal subtotalChf;
 
+    @ColumnDefault("false")
+    @Column(name = "is_cad_order", nullable = false)
+    private Boolean isCadOrder;
+
+    @Column(name = "source_request_id")
+    private UUID sourceRequestId;
+
+    @Column(name = "cad_hours", precision = 10, scale = 2)
+    private BigDecimal cadHours;
+
+    @Column(name = "cad_hourly_rate_chf", precision = 10, scale = 2)
+    private BigDecimal cadHourlyRateChf;
+
+    @ColumnDefault("0.00")
+    @Column(name = "cad_total_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal cadTotalChf;
+
     @ColumnDefault("0.00")
     @Column(name = "total_chf", nullable = false, precision = 12, scale = 2)
     private BigDecimal totalChf;
@@ -400,6 +417,46 @@ public class Order {
         this.subtotalChf = subtotalChf;
     }
 
+    public Boolean getIsCadOrder() {
+        return isCadOrder;
+    }
+
+    public void setIsCadOrder(Boolean isCadOrder) {
+        this.isCadOrder = isCadOrder;
+    }
+
+    public UUID getSourceRequestId() {
+        return sourceRequestId;
+    }
+
+    public void setSourceRequestId(UUID sourceRequestId) {
+        this.sourceRequestId = sourceRequestId;
+    }
+
+    public BigDecimal getCadHours() {
+        return cadHours;
+    }
+
+    public void setCadHours(BigDecimal cadHours) {
+        this.cadHours = cadHours;
+    }
+
+    public BigDecimal getCadHourlyRateChf() {
+        return cadHourlyRateChf;
+    }
+
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
+        this.cadHourlyRateChf = cadHourlyRateChf;
+    }
+
+    public BigDecimal getCadTotalChf() {
+        return cadTotalChf;
+    }
+
+    public void setCadTotalChf(BigDecimal cadTotalChf) {
+        this.cadTotalChf = cadTotalChf;
+    }
+
     public BigDecimal getTotalChf() {
         return totalChf;
     }

backend/src/main/java/com/printcalculator/entity/OrderItem.java

@@ -44,6 +44,24 @@ public class OrderItem {
     @Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
     private String materialCode;
 
+    @Column(name = "quality", length = Integer.MAX_VALUE)
+    private String quality;
+
+    @Column(name = "nozzle_diameter_mm", precision = 4, scale = 2)
+    private BigDecimal nozzleDiameterMm;
+
+    @Column(name = "layer_height_mm", precision = 5, scale = 3)
+    private BigDecimal layerHeightMm;
+
+    @Column(name = "infill_percent")
+    private Integer infillPercent;
+
+    @Column(name = "infill_pattern", length = Integer.MAX_VALUE)
+    private String infillPattern;
+
+    @Column(name = "supports_enabled")
+    private Boolean supportsEnabled;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "filament_variant_id")
     private FilamentVariant filamentVariant;
@@ -162,6 +180,54 @@ public class OrderItem {
         this.materialCode = materialCode;
     }
 
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
+    public BigDecimal getNozzleDiameterMm() {
+        return nozzleDiameterMm;
+    }
+
+    public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) {
+        this.nozzleDiameterMm = nozzleDiameterMm;
+    }
+
+    public BigDecimal getLayerHeightMm() {
+        return layerHeightMm;
+    }
+
+    public void setLayerHeightMm(BigDecimal layerHeightMm) {
+        this.layerHeightMm = layerHeightMm;
+    }
+
+    public Integer getInfillPercent() {
+        return infillPercent;
+    }
+
+    public void setInfillPercent(Integer infillPercent) {
+        this.infillPercent = infillPercent;
+    }
+
+    public String getInfillPattern() {
+        return infillPattern;
+    }
+
+    public void setInfillPattern(String infillPattern) {
+        this.infillPattern = infillPattern;
+    }
+
+    public Boolean getSupportsEnabled() {
+        return supportsEnabled;
+    }
+
+    public void setSupportsEnabled(Boolean supportsEnabled) {
+        this.supportsEnabled = supportsEnabled;
+    }
+
     public FilamentVariant getFilamentVariant() {
         return filamentVariant;
     }

backend/src/main/java/com/printcalculator/entity/QuoteLineItem.java

@@ -45,6 +45,27 @@ public class QuoteLineItem {
     @com.fasterxml.jackson.annotation.JsonIgnore
     private FilamentVariant filamentVariant;
 
+    @Column(name = "material_code", length = Integer.MAX_VALUE)
+    private String materialCode;
+
+    @Column(name = "quality", length = Integer.MAX_VALUE)
+    private String quality;
+
+    @Column(name = "nozzle_diameter_mm", precision = 5, scale = 2)
+    private BigDecimal nozzleDiameterMm;
+
+    @Column(name = "layer_height_mm", precision = 6, scale = 3)
+    private BigDecimal layerHeightMm;
+
+    @Column(name = "infill_percent")
+    private Integer infillPercent;
+
+    @Column(name = "infill_pattern", length = Integer.MAX_VALUE)
+    private String infillPattern;
+
+    @Column(name = "supports_enabled")
+    private Boolean supportsEnabled;
+
     @Column(name = "bounding_box_x_mm", precision = 10, scale = 3)
     private BigDecimal boundingBoxXMm;
 
@@ -137,6 +158,62 @@ public class QuoteLineItem {
         this.filamentVariant = filamentVariant;
     }
 
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
+    public BigDecimal getNozzleDiameterMm() {
+        return nozzleDiameterMm;
+    }
+
+    public void setNozzleDiameterMm(BigDecimal nozzleDiameterMm) {
+        this.nozzleDiameterMm = nozzleDiameterMm;
+    }
+
+    public BigDecimal getLayerHeightMm() {
+        return layerHeightMm;
+    }
+
+    public void setLayerHeightMm(BigDecimal layerHeightMm) {
+        this.layerHeightMm = layerHeightMm;
+    }
+
+    public Integer getInfillPercent() {
+        return infillPercent;
+    }
+
+    public void setInfillPercent(Integer infillPercent) {
+        this.infillPercent = infillPercent;
+    }
+
+    public String getInfillPattern() {
+        return infillPattern;
+    }
+
+    public void setInfillPattern(String infillPattern) {
+        this.infillPattern = infillPattern;
+    }
+
+    public Boolean getSupportsEnabled() {
+        return supportsEnabled;
+    }
+
+    public void setSupportsEnabled(Boolean supportsEnabled) {
+        this.supportsEnabled = supportsEnabled;
+    }
+
     public BigDecimal getBoundingBoxXMm() {
         return boundingBoxXMm;
     }

backend/src/main/java/com/printcalculator/entity/QuoteSession.java

@@ -61,6 +61,15 @@ public class QuoteSession {
     @Column(name = "converted_order_id")
     private UUID convertedOrderId;
 
+    @Column(name = "source_request_id")
+    private UUID sourceRequestId;
+
+    @Column(name = "cad_hours", precision = 10, scale = 2)
+    private BigDecimal cadHours;
+
+    @Column(name = "cad_hourly_rate_chf", precision = 10, scale = 2)
+    private BigDecimal cadHourlyRateChf;
+
     public UUID getId() {
         return id;
     }
@@ -173,4 +182,28 @@ public class QuoteSession {
         this.convertedOrderId = convertedOrderId;
     }
 
-}
+    public UUID getSourceRequestId() {
+        return sourceRequestId;
+    }
+
+    public void setSourceRequestId(UUID sourceRequestId) {
+        this.sourceRequestId = sourceRequestId;
+    }
+
+    public BigDecimal getCadHours() {
+        return cadHours;
+    }
+
+    public void setCadHours(BigDecimal cadHours) {
+        this.cadHours = cadHours;
+    }
+
+    public BigDecimal getCadHourlyRateChf() {
+        return cadHourlyRateChf;
+    }
+
+    public void setCadHourlyRateChf(BigDecimal cadHourlyRateChf) {
+        this.cadHourlyRateChf = cadHourlyRateChf;
+    }
+
+}

backend/src/main/java/com/printcalculator/event/OrderShippedEvent.java

@@ -0,0 +1,16 @@
+package com.printcalculator.event;
+
+import com.printcalculator.entity.Order;
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+@Getter
+public class OrderShippedEvent extends ApplicationEvent {
+
+    private final Order order;
+
+    public OrderShippedEvent(Object source, Order order) {
+        super(source);
+        this.order = order;
+    }
+}

backend/src/main/java/com/printcalculator/event/listener/OrderEmailListener.java

@@ -4,12 +4,13 @@ import com.printcalculator.entity.Order;
 import com.printcalculator.entity.OrderItem;
 import com.printcalculator.entity.Payment;
 import com.printcalculator.event.OrderCreatedEvent;
+import com.printcalculator.event.OrderShippedEvent;
 import com.printcalculator.event.PaymentConfirmedEvent;
 import com.printcalculator.event.PaymentReportedEvent;
 import com.printcalculator.repository.OrderItemRepository;
-import com.printcalculator.service.InvoicePdfRenderingService;
-import com.printcalculator.service.QrBillService;
-import com.printcalculator.service.StorageService;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
 import com.printcalculator.service.email.EmailNotificationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -95,6 +96,19 @@ public class OrderEmailListener {
         }
     }
 
+    @Async
+    @EventListener
+    public void handleOrderShippedEvent(OrderShippedEvent event) {
+        Order order = event.getOrder();
+        log.info("Processing OrderShippedEvent for order id: {}", order.getId());
+
+        try {
+            sendOrderShippedEmail(order);
+        } catch (Exception e) {
+            log.error("Failed to send order shipped email for order id: {}", order.getId(), e);
+        }
+    }
+
     private void sendCustomerConfirmationEmail(Order order) {
         String language = resolveLanguage(order.getPreferredLanguage());
         String orderNumber = getDisplayOrderNumber(order);
@@ -153,6 +167,21 @@ public class OrderEmailListener {
         );
     }
 
+    private void sendOrderShippedEmail(Order order) {
+        String language = resolveLanguage(order.getPreferredLanguage());
+        String orderNumber = getDisplayOrderNumber(order);
+
+        Map<String, Object> templateData = buildBaseTemplateData(order, language);
+        String subject = applyOrderShippedTexts(templateData, language, orderNumber);
+
+        emailNotificationService.sendEmail(
+                order.getCustomer().getEmail(),
+                subject,
+                "order-shipped",
+                templateData
+        );
+    }
+
     private void sendAdminNotificationEmail(Order order) {
         String orderNumber = getDisplayOrderNumber(order);
         Map<String, Object> templateData = buildBaseTemplateData(order, DEFAULT_LANGUAGE);
@@ -381,6 +410,63 @@ public class OrderEmailListener {
         };
     }
 
+    private String applyOrderShippedTexts(Map<String, Object> templateData, String language, String orderNumber) {
+        return switch (language) {
+            case "en" -> {
+                templateData.put("emailTitle", "Order Shipped");
+                templateData.put("headlineText", "Your order #" + orderNumber + " has been shipped");
+                templateData.put("greetingText", "Hi " + templateData.get("customerName") + ",");
+                templateData.put("introText", "Good news: your package has left our workshop and is on its way.");
+                templateData.put("statusText", "Current status: Shipped.");
+                templateData.put("orderDetailsCtaText", "View order status");
+                templateData.put("supportText", "If you need assistance, reply to this email.");
+                templateData.put("footerText", "Automated message from 3D-Fab.");
+                templateData.put("labelOrderNumber", "Order number");
+                templateData.put("labelTotal", "Total");
+                yield "Your order has been shipped (Order #" + orderNumber + ") - 3D-Fab";
+            }
+            case "de" -> {
+                templateData.put("emailTitle", "Bestellung versandt");
+                templateData.put("headlineText", "Ihre Bestellung #" + orderNumber + " wurde versandt");
+                templateData.put("greetingText", "Hallo " + templateData.get("customerName") + ",");
+                templateData.put("introText", "Gute Nachricht: Ihr Paket hat unsere Werkstatt verlassen und ist unterwegs.");
+                templateData.put("statusText", "Aktueller Status: Versandt.");
+                templateData.put("orderDetailsCtaText", "Bestellstatus ansehen");
+                templateData.put("supportText", "Wenn Sie Hilfe benoetigen, antworten Sie auf diese E-Mail.");
+                templateData.put("footerText", "Automatische Nachricht von 3D-Fab.");
+                templateData.put("labelOrderNumber", "Bestellnummer");
+                templateData.put("labelTotal", "Gesamtbetrag");
+                yield "Ihre Bestellung wurde versandt (Bestellung #" + orderNumber + ") - 3D-Fab";
+            }
+            case "fr" -> {
+                templateData.put("emailTitle", "Commande expediee");
+                templateData.put("headlineText", "Votre commande #" + orderNumber + " a ete expediee");
+                templateData.put("greetingText", "Bonjour " + templateData.get("customerName") + ",");
+                templateData.put("introText", "Bonne nouvelle: votre colis a quitte notre atelier et est en route.");
+                templateData.put("statusText", "Statut actuel: Expediee.");
+                templateData.put("orderDetailsCtaText", "Voir le statut de la commande");
+                templateData.put("supportText", "Si vous avez besoin d'aide, repondez a cet email.");
+                templateData.put("footerText", "Message automatique de 3D-Fab.");
+                templateData.put("labelOrderNumber", "Numero de commande");
+                templateData.put("labelTotal", "Total");
+                yield "Votre commande a ete expediee (Commande #" + orderNumber + ") - 3D-Fab";
+            }
+            default -> {
+                templateData.put("emailTitle", "Ordine spedito");
+                templateData.put("headlineText", "Il tuo ordine #" + orderNumber + " e' stato spedito");
+                templateData.put("greetingText", "Ciao " + templateData.get("customerName") + ",");
+                templateData.put("introText", "Buone notizie: il tuo pacco e' partito dal nostro laboratorio ed e' in viaggio.");
+                templateData.put("statusText", "Stato attuale: spedito.");
+                templateData.put("orderDetailsCtaText", "Visualizza stato ordine");
+                templateData.put("supportText", "Se hai bisogno di assistenza, rispondi a questa email.");
+                templateData.put("footerText", "Messaggio automatico di 3D-Fab.");
+                templateData.put("labelOrderNumber", "Numero ordine");
+                templateData.put("labelTotal", "Totale");
+                yield "Il tuo ordine e' stato spedito (Ordine #" + orderNumber + ") - 3D-Fab";
+            }
+        };
+    }
+
     private String getDisplayOrderNumber(Order order) {
         String orderNumber = order.getOrderNumber();
         if (orderNumber != null && !orderNumber.isBlank()) {

backend/src/main/java/com/printcalculator/exception/GlobalExceptionHandler.java

@@ -17,6 +17,20 @@ import java.util.Map;
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
+    @ExceptionHandler(ModelProcessingException.class)
+    public ResponseEntity<Object> handleModelProcessingException(
+            ModelProcessingException ex, WebRequest request) {
+        Map<String, Object> body = new LinkedHashMap<>();
+        body.put("timestamp", LocalDateTime.now());
+        body.put("status", HttpStatus.UNPROCESSABLE_ENTITY.value());
+        body.put("error", "Unprocessable Entity");
+        body.put("code", ex.getCode());
+        body.put("message", ex.getMessage());
+        body.put("path", extractPath(request));
+
+        return new ResponseEntity<>(body, HttpStatus.UNPROCESSABLE_ENTITY);
+    }
+
     @ExceptionHandler(VirusDetectedException.class)
     public ResponseEntity<Object> handleVirusDetectedException(
             VirusDetectedException ex, WebRequest request) {
@@ -58,4 +72,12 @@ public class GlobalExceptionHandler {
 
         return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);
     }
+
+    private String extractPath(WebRequest request) {
+        String raw = request.getDescription(false);
+        if (raw == null) {
+            return "";
+        }
+        return raw.startsWith("uri=") ? raw.substring(4) : raw;
+    }
 }

backend/src/main/java/com/printcalculator/exception/ModelProcessingException.java

@@ -0,0 +1,21 @@
+package com.printcalculator.exception;
+
+import java.io.IOException;
+
+public class ModelProcessingException extends IOException {
+    private final String code;
+
+    public ModelProcessingException(String code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public ModelProcessingException(String code, String message, Throwable cause) {
+        super(message, cause);
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

backend/src/main/java/com/printcalculator/repository/NozzleLayerHeightOptionRepository.java

@@ -0,0 +1,10 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.NozzleLayerHeightOption;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface NozzleLayerHeightOptionRepository extends JpaRepository<NozzleLayerHeightOption, Long> {
+    List<NozzleLayerHeightOption> findByIsActiveTrueOrderByNozzleDiameterMmAscLayerHeightMmAsc();
+}

backend/src/main/java/com/printcalculator/repository/QuoteSessionRepository.java

@@ -8,4 +8,6 @@ import java.util.UUID;
 
 public interface QuoteSessionRepository extends JpaRepository<QuoteSession, UUID> {
     List<QuoteSession> findByCreatedAtBefore(java.time.OffsetDateTime cutoff);
-}
+
+    List<QuoteSession> findByStatusInOrderByCreatedAtDesc(List<String> statuses);
+}

backend/src/main/java/com/printcalculator/service/NozzleLayerHeightPolicyService.java

@@ -0,0 +1,143 @@
+package com.printcalculator.service;
+
+import com.printcalculator.entity.NozzleLayerHeightOption;
+import com.printcalculator.repository.NozzleLayerHeightOptionRepository;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+@Service
+public class NozzleLayerHeightPolicyService {
+    private static final BigDecimal DEFAULT_NOZZLE = BigDecimal.valueOf(0.40).setScale(2, RoundingMode.HALF_UP);
+    private static final BigDecimal DEFAULT_LAYER = BigDecimal.valueOf(0.20).setScale(3, RoundingMode.HALF_UP);
+
+    private final NozzleLayerHeightOptionRepository ruleRepo;
+
+    public NozzleLayerHeightPolicyService(NozzleLayerHeightOptionRepository ruleRepo) {
+        this.ruleRepo = ruleRepo;
+    }
+
+    public Map<BigDecimal, List<BigDecimal>> getActiveRulesByNozzle() {
+        List<NozzleLayerHeightOption> rules = ruleRepo.findByIsActiveTrueOrderByNozzleDiameterMmAscLayerHeightMmAsc();
+        if (rules.isEmpty()) {
+            return fallbackRules();
+        }
+
+        Map<BigDecimal, List<BigDecimal>> byNozzle = new LinkedHashMap<>();
+        for (NozzleLayerHeightOption rule : rules) {
+            BigDecimal nozzle = normalizeNozzle(rule.getNozzleDiameterMm());
+            BigDecimal layer = normalizeLayer(rule.getLayerHeightMm());
+            if (nozzle == null || layer == null) {
+                continue;
+            }
+            byNozzle.computeIfAbsent(nozzle, ignored -> new ArrayList<>()).add(layer);
+        }
+
+        byNozzle.values().forEach(this::sortAndDeduplicate);
+        return byNozzle;
+    }
+
+    public BigDecimal normalizeNozzle(BigDecimal value) {
+        if (value == null) {
+            return null;
+        }
+        return value.setScale(2, RoundingMode.HALF_UP);
+    }
+
+    public BigDecimal normalizeLayer(BigDecimal value) {
+        if (value == null) {
+            return null;
+        }
+        return value.setScale(3, RoundingMode.HALF_UP);
+    }
+
+    public BigDecimal resolveNozzle(BigDecimal requestedNozzle) {
+        return normalizeNozzle(requestedNozzle != null ? requestedNozzle : DEFAULT_NOZZLE);
+    }
+
+    public BigDecimal resolveLayer(BigDecimal requestedLayer, BigDecimal nozzleDiameter) {
+        if (requestedLayer != null) {
+            return normalizeLayer(requestedLayer);
+        }
+        return defaultLayerForNozzle(nozzleDiameter);
+    }
+
+    public List<BigDecimal> allowedLayersForNozzle(BigDecimal nozzleDiameter) {
+        BigDecimal nozzle = resolveNozzle(nozzleDiameter);
+        List<BigDecimal> allowed = getActiveRulesByNozzle().get(nozzle);
+        return allowed != null ? allowed : List.of();
+    }
+
+    public boolean isAllowed(BigDecimal nozzleDiameter, BigDecimal layerHeight) {
+        BigDecimal layer = normalizeLayer(layerHeight);
+        if (layer == null) {
+            return false;
+        }
+        return allowedLayersForNozzle(nozzleDiameter)
+                .stream()
+                .anyMatch(allowed -> allowed.compareTo(layer) == 0);
+    }
+
+    public BigDecimal defaultLayerForNozzle(BigDecimal nozzleDiameter) {
+        List<BigDecimal> allowed = allowedLayersForNozzle(nozzleDiameter);
+        if (allowed.isEmpty()) {
+            return DEFAULT_LAYER;
+        }
+
+        BigDecimal preferred = normalizeLayer(DEFAULT_LAYER);
+        for (BigDecimal candidate : allowed) {
+            if (candidate.compareTo(preferred) == 0) {
+                return candidate;
+            }
+        }
+        return allowed.get(0);
+    }
+
+    public String allowedLayersLabel(BigDecimal nozzleDiameter) {
+        List<BigDecimal> allowed = allowedLayersForNozzle(nozzleDiameter);
+        if (allowed.isEmpty()) {
+            return "none";
+        }
+        return allowed.stream()
+                .map(value -> String.format(Locale.ROOT, "%.2f", value))
+                .reduce((a, b) -> a + ", " + b)
+                .orElse("none");
+    }
+
+    private void sortAndDeduplicate(List<BigDecimal> values) {
+        values.sort(Comparator.naturalOrder());
+        for (int i = values.size() - 1; i > 0; i--) {
+            if (values.get(i).compareTo(values.get(i - 1)) == 0) {
+                values.remove(i);
+            }
+        }
+    }
+
+    private Map<BigDecimal, List<BigDecimal>> fallbackRules() {
+        Map<BigDecimal, List<BigDecimal>> fallback = new LinkedHashMap<>();
+        fallback.put(scaleNozzle(0.20), scaleLayers(0.04, 0.06, 0.08, 0.10, 0.12));
+        fallback.put(scaleNozzle(0.40), scaleLayers(0.08, 0.12, 0.16, 0.20, 0.24, 0.28));
+        fallback.put(scaleNozzle(0.60), scaleLayers(0.16, 0.20, 0.24, 0.30, 0.36));
+        fallback.put(scaleNozzle(0.80), scaleLayers(0.20, 0.28, 0.36, 0.40, 0.48, 0.56));
+        return fallback;
+    }
+
+    private BigDecimal scaleNozzle(double value) {
+        return BigDecimal.valueOf(value).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    private List<BigDecimal> scaleLayers(double... values) {
+        List<BigDecimal> scaled = new ArrayList<>();
+        for (double value : values) {
+            scaled.add(BigDecimal.valueOf(value).setScale(3, RoundingMode.HALF_UP));
+        }
+        return scaled;
+    }
+}

backend/src/main/java/com/printcalculator/service/OrderService.java

@@ -7,8 +7,11 @@ import com.printcalculator.repository.OrderItemRepository;
 import com.printcalculator.repository.OrderRepository;
 import com.printcalculator.repository.QuoteLineItemRepository;
 import com.printcalculator.repository.QuoteSessionRepository;
-import com.printcalculator.repository.PricingPolicyRepository;
 import com.printcalculator.event.OrderCreatedEvent;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.PaymentService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +20,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.OffsetDateTime;
@@ -24,6 +28,7 @@ import java.util.*;
 
 @Service
 public class OrderService {
+    private static final Path QUOTE_STORAGE_ROOT = Paths.get("storage_quotes").toAbsolutePath().normalize();
 
     private final OrderRepository orderRepo;
     private final OrderItemRepository orderItemRepo;
@@ -35,8 +40,7 @@ public class OrderService {
     private final QrBillService qrBillService;
     private final ApplicationEventPublisher eventPublisher;
     private final PaymentService paymentService;
-    private final QuoteCalculator quoteCalculator;
-    private final PricingPolicyRepository pricingRepo;
+    private final QuoteSessionTotalsService quoteSessionTotalsService;
 
     public OrderService(OrderRepository orderRepo,
                         OrderItemRepository orderItemRepo,
@@ -48,8 +52,7 @@ public class OrderService {
                         QrBillService qrBillService,
                         ApplicationEventPublisher eventPublisher,
                         PaymentService paymentService,
-                        QuoteCalculator quoteCalculator,
-                        PricingPolicyRepository pricingRepo) {
+                        QuoteSessionTotalsService quoteSessionTotalsService) {
         this.orderRepo = orderRepo;
         this.orderItemRepo = orderItemRepo;
         this.quoteSessionRepo = quoteSessionRepo;
@@ -60,8 +63,7 @@ public class OrderService {
         this.qrBillService = qrBillService;
         this.eventPublisher = eventPublisher;
         this.paymentService = paymentService;
-        this.quoteCalculator = quoteCalculator;
-        this.pricingRepo = pricingRepo;
+        this.quoteSessionTotalsService = quoteSessionTotalsService;
     }
 
     @Transactional
@@ -148,60 +150,31 @@ public class OrderService {
         }
 
         List<QuoteLineItem> quoteItems = quoteLineItemRepo.findByQuoteSessionId(quoteSessionId);
+        QuoteSessionTotalsService.QuoteSessionTotals totals = quoteSessionTotalsService.compute(session, quoteItems);
+        BigDecimal cadTotal = totals.cadTotalChf();
 
         BigDecimal subtotal = BigDecimal.ZERO;
         order.setSubtotalChf(BigDecimal.ZERO);
         order.setTotalChf(BigDecimal.ZERO);
         order.setDiscountChf(BigDecimal.ZERO);
         order.setSetupCostChf(session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO);
-        
-        // Calculate shipping cost based on dimensions before initial save
-        boolean exceedsBaseSize = false;
-        for (QuoteLineItem item : quoteItems) {
-            BigDecimal x = item.getBoundingBoxXMm() != null ? item.getBoundingBoxXMm() : BigDecimal.ZERO;
-            BigDecimal y = item.getBoundingBoxYMm() != null ? item.getBoundingBoxYMm() : BigDecimal.ZERO;
-            BigDecimal z = item.getBoundingBoxZMm() != null ? item.getBoundingBoxZMm() : BigDecimal.ZERO;
-            
-            BigDecimal[] dims = {x, y, z};
-            java.util.Arrays.sort(dims);
-            
-            if (dims[2].compareTo(BigDecimal.valueOf(250.0)) > 0 ||
-                dims[1].compareTo(BigDecimal.valueOf(176.0)) > 0 ||
-                dims[0].compareTo(BigDecimal.valueOf(20.0)) > 0) {
-                exceedsBaseSize = true;
-                break;
-            }
-        }
-        int totalQuantity = quoteItems.stream()
-                .mapToInt(i -> i.getQuantity() != null ? i.getQuantity() : 1)
-                .sum();
-
-        if (exceedsBaseSize) {
-            order.setShippingCostChf(totalQuantity > 5 ? BigDecimal.valueOf(9.00) : BigDecimal.valueOf(4.00));
-        } else {
-            order.setShippingCostChf(BigDecimal.valueOf(2.00));
-        }
+        order.setShippingCostChf(totals.shippingCostChf());
+        order.setIsCadOrder(cadTotal.compareTo(BigDecimal.ZERO) > 0 || "CAD_ACTIVE".equals(session.getStatus()));
+        order.setSourceRequestId(session.getSourceRequestId());
+        order.setCadHours(session.getCadHours() != null ? session.getCadHours() : BigDecimal.ZERO);
+        order.setCadHourlyRateChf(session.getCadHourlyRateChf() != null ? session.getCadHourlyRateChf() : BigDecimal.ZERO);
+        order.setCadTotalChf(cadTotal);
 
         order = orderRepo.save(order);
 
         List<OrderItem> savedItems = new ArrayList<>();
 
-        // Calculate global machine cost upfront
-        BigDecimal totalSeconds = BigDecimal.ZERO;
-        for (QuoteLineItem qItem : quoteItems) {
-            if (qItem.getPrintTimeSeconds() != null) {
-                totalSeconds = totalSeconds.add(BigDecimal.valueOf(qItem.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(qItem.getQuantity())));
-            }
-        }
-        BigDecimal totalHours = totalSeconds.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
-        PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
-        BigDecimal globalMachineCost = quoteCalculator.calculateSessionMachineCost(policy, totalHours);
-
         for (QuoteLineItem qItem : quoteItems) {
             OrderItem oItem = new OrderItem();
             oItem.setOrder(order);
             oItem.setOriginalFilename(qItem.getOriginalFilename());
-            oItem.setQuantity(qItem.getQuantity());
+            int quantity = qItem.getQuantity() != null && qItem.getQuantity() > 0 ? qItem.getQuantity() : 1;
+            oItem.setQuantity(quantity);
             oItem.setColorCode(qItem.getColorCode());
             oItem.setFilamentVariant(qItem.getFilamentVariant());
             if (qItem.getFilamentVariant() != null
@@ -211,18 +184,24 @@ public class OrderService {
             } else {
                 oItem.setMaterialCode(session.getMaterialCode());
             }
+            oItem.setQuality(qItem.getQuality());
+            oItem.setNozzleDiameterMm(qItem.getNozzleDiameterMm());
+            oItem.setLayerHeightMm(qItem.getLayerHeightMm());
+            oItem.setInfillPercent(qItem.getInfillPercent());
+            oItem.setInfillPattern(qItem.getInfillPattern());
+            oItem.setSupportsEnabled(qItem.getSupportsEnabled());
 
-            BigDecimal distributedUnitPrice = qItem.getUnitPriceChf();
-            if (totalSeconds.compareTo(BigDecimal.ZERO) > 0 && qItem.getPrintTimeSeconds() != null) {
-                BigDecimal itemSeconds = BigDecimal.valueOf(qItem.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(qItem.getQuantity()));
-                BigDecimal share = itemSeconds.divide(totalSeconds, 8, RoundingMode.HALF_UP);
-                BigDecimal itemMachineCost = globalMachineCost.multiply(share);
-                BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(qItem.getQuantity()), 2, RoundingMode.HALF_UP);
+            BigDecimal distributedUnitPrice = qItem.getUnitPriceChf() != null ? qItem.getUnitPriceChf() : BigDecimal.ZERO;
+            if (totals.totalPrintSeconds().compareTo(BigDecimal.ZERO) > 0 && qItem.getPrintTimeSeconds() != null) {
+                BigDecimal itemSeconds = BigDecimal.valueOf(qItem.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(quantity));
+                BigDecimal share = itemSeconds.divide(totals.totalPrintSeconds(), 8, RoundingMode.HALF_UP);
+                BigDecimal itemMachineCost = totals.globalMachineCostChf().multiply(share);
+                BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(quantity), 2, RoundingMode.HALF_UP);
                 distributedUnitPrice = distributedUnitPrice.add(unitMachineCost);
             }
 
             oItem.setUnitPriceChf(distributedUnitPrice);
-            oItem.setLineTotalChf(distributedUnitPrice.multiply(BigDecimal.valueOf(qItem.getQuantity())));
+            oItem.setLineTotalChf(distributedUnitPrice.multiply(BigDecimal.valueOf(quantity)));
             oItem.setPrintTimeSeconds(qItem.getPrintTimeSeconds());
             oItem.setMaterialGrams(qItem.getMaterialGrams());
             oItem.setBoundingBoxXMm(qItem.getBoundingBoxXMm());
@@ -243,16 +222,15 @@ public class OrderService {
             String relativePath = "orders/" + order.getId() + "/3d-files/" + oItem.getId() + "/" + storedFilename;
             oItem.setStoredRelativePath(relativePath);
 
-            if (qItem.getStoredPath() != null) {
-                try {
-                    Path sourcePath = Paths.get(qItem.getStoredPath());
-                    if (Files.exists(sourcePath)) {
-                        storageService.store(sourcePath, Paths.get(relativePath));
-                        oItem.setFileSizeBytes(Files.size(sourcePath));
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+            Path sourcePath = resolveStoredQuotePath(qItem.getStoredPath(), session.getId());
+            if (sourcePath == null || !Files.exists(sourcePath)) {
+                throw new IllegalStateException("Source file not available for quote line item " + qItem.getId());
+            }
+            try {
+                storageService.store(sourcePath, Paths.get(relativePath));
+                oItem.setFileSizeBytes(Files.size(sourcePath));
+            } catch (IOException e) {
+                throw new RuntimeException("Failed to copy quote file for line item " + qItem.getId(), e);
             }
 
             oItem = orderItemRepo.save(oItem);
@@ -260,9 +238,12 @@ public class OrderService {
             subtotal = subtotal.add(oItem.getLineTotalChf());
         }
 
-        order.setSubtotalChf(subtotal);
+        order.setSubtotalChf(subtotal.add(cadTotal));
         
-        BigDecimal total = subtotal.add(order.getSetupCostChf()).add(order.getShippingCostChf()).subtract(order.getDiscountChf() != null ? order.getDiscountChf() : BigDecimal.ZERO);
+        BigDecimal total = order.getSubtotalChf()
+                .add(order.getSetupCostChf())
+                .add(order.getShippingCostChf())
+                .subtract(order.getDiscountChf() != null ? order.getDiscountChf() : BigDecimal.ZERO);
         order.setTotalChf(total);
 
         session.setConvertedOrderId(order.getId());
@@ -321,6 +302,23 @@ public class OrderService {
         return "stl";
     }
 
+    private Path resolveStoredQuotePath(String storedPath, UUID expectedSessionId) {
+        if (storedPath == null || storedPath.isBlank()) {
+            return null;
+        }
+        try {
+            Path raw = Path.of(storedPath).normalize();
+            Path resolved = raw.isAbsolute() ? raw : QUOTE_STORAGE_ROOT.resolve(raw).normalize();
+            Path expectedSessionRoot = QUOTE_STORAGE_ROOT.resolve(expectedSessionId.toString()).normalize();
+            if (!resolved.startsWith(expectedSessionRoot)) {
+                return null;
+            }
+            return resolved;
+        } catch (InvalidPathException e) {
+            return null;
+        }
+    }
+
     private String getDisplayOrderNumber(Order order) {
         String orderNumber = order.getOrderNumber();
         if (orderNumber != null && !orderNumber.isBlank()) {

backend/src/main/java/com/printcalculator/service/QuoteSessionTotalsService.java

@@ -0,0 +1,124 @@
+package com.printcalculator.service;
+
+import com.printcalculator.entity.PricingPolicy;
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.repository.PricingPolicyRepository;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class QuoteSessionTotalsService {
+    private final PricingPolicyRepository pricingRepo;
+    private final QuoteCalculator quoteCalculator;
+
+    public QuoteSessionTotalsService(PricingPolicyRepository pricingRepo, QuoteCalculator quoteCalculator) {
+        this.pricingRepo = pricingRepo;
+        this.quoteCalculator = quoteCalculator;
+    }
+
+    public QuoteSessionTotals compute(QuoteSession session, List<QuoteLineItem> items) {
+        BigDecimal printItemsBaseTotal = BigDecimal.ZERO;
+        BigDecimal totalSeconds = BigDecimal.ZERO;
+
+        for (QuoteLineItem item : items) {
+            int quantity = normalizeQuantity(item.getQuantity());
+            BigDecimal unitPrice = item.getUnitPriceChf() != null ? item.getUnitPriceChf() : BigDecimal.ZERO;
+            printItemsBaseTotal = printItemsBaseTotal.add(unitPrice.multiply(BigDecimal.valueOf(quantity)));
+
+            if (item.getPrintTimeSeconds() != null && item.getPrintTimeSeconds() > 0) {
+                totalSeconds = totalSeconds.add(BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(quantity)));
+            }
+        }
+
+        BigDecimal totalHours = totalSeconds.divide(BigDecimal.valueOf(3600), 4, RoundingMode.HALF_UP);
+        PricingPolicy policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
+        BigDecimal globalMachineCost = quoteCalculator.calculateSessionMachineCost(policy, totalHours);
+        BigDecimal printItemsTotal = printItemsBaseTotal.add(globalMachineCost);
+
+        BigDecimal cadTotal = calculateCadTotal(session);
+        BigDecimal itemsTotal = printItemsTotal.add(cadTotal);
+
+        BigDecimal setupFee = session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO;
+        BigDecimal shippingCost = calculateShippingCost(items);
+        BigDecimal grandTotal = itemsTotal.add(setupFee).add(shippingCost);
+
+        return new QuoteSessionTotals(
+                printItemsTotal,
+                globalMachineCost,
+                cadTotal,
+                itemsTotal,
+                setupFee,
+                shippingCost,
+                grandTotal,
+                totalSeconds
+        );
+    }
+
+    public BigDecimal calculateCadTotal(QuoteSession session) {
+        if (session == null) {
+            return BigDecimal.ZERO;
+        }
+        BigDecimal cadHours = session.getCadHours() != null ? session.getCadHours() : BigDecimal.ZERO;
+        BigDecimal cadRate = session.getCadHourlyRateChf() != null ? session.getCadHourlyRateChf() : BigDecimal.ZERO;
+        if (cadHours.compareTo(BigDecimal.ZERO) <= 0 || cadRate.compareTo(BigDecimal.ZERO) <= 0) {
+            return BigDecimal.ZERO;
+        }
+        return cadHours.multiply(cadRate).setScale(2, RoundingMode.HALF_UP);
+    }
+
+    public BigDecimal calculateShippingCost(List<QuoteLineItem> items) {
+        if (items == null || items.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+
+        boolean exceedsBaseSize = false;
+        for (QuoteLineItem item : items) {
+            BigDecimal x = item.getBoundingBoxXMm() != null ? item.getBoundingBoxXMm() : BigDecimal.ZERO;
+            BigDecimal y = item.getBoundingBoxYMm() != null ? item.getBoundingBoxYMm() : BigDecimal.ZERO;
+            BigDecimal z = item.getBoundingBoxZMm() != null ? item.getBoundingBoxZMm() : BigDecimal.ZERO;
+
+            BigDecimal[] dims = {x, y, z};
+            Arrays.sort(dims);
+
+            if (dims[2].compareTo(BigDecimal.valueOf(250.0)) > 0
+                    || dims[1].compareTo(BigDecimal.valueOf(176.0)) > 0
+                    || dims[0].compareTo(BigDecimal.valueOf(20.0)) > 0) {
+                exceedsBaseSize = true;
+                break;
+            }
+        }
+
+        int totalQuantity = items.stream().mapToInt(i -> normalizeQuantity(i.getQuantity())).sum();
+        if (totalQuantity <= 0) {
+            return BigDecimal.ZERO;
+        }
+
+        if (exceedsBaseSize) {
+            return totalQuantity > 5 ? BigDecimal.valueOf(9.00) : BigDecimal.valueOf(4.00);
+        }
+        return BigDecimal.valueOf(2.00);
+    }
+
+    private int normalizeQuantity(Integer quantity) {
+        if (quantity == null || quantity < 1) {
+            return 1;
+        }
+        return quantity;
+    }
+
+    public record QuoteSessionTotals(
+            BigDecimal printItemsTotalChf,
+            BigDecimal globalMachineCostChf,
+            BigDecimal cadTotalChf,
+            BigDecimal itemsTotalChf,
+            BigDecimal setupCostChf,
+            BigDecimal shippingCostChf,
+            BigDecimal grandTotalChf,
+            BigDecimal totalPrintSeconds
+    ) {}
+}

backend/src/main/java/com/printcalculator/service/SessionCleanupService.java

@@ -45,9 +45,8 @@ public class SessionCleanupService {
             // "rimangono in memoria... cancella quelle vecchie di 7 giorni".
             // Implementation plan said: status != 'ORDERED'.
             
-            // User specified statuses: ACTIVE, EXPIRED, CONVERTED.
-            // We should NOT delete sessions that have been converted to an order.
-            if ("CONVERTED".equals(session.getStatus())) {
+            // CAD_ACTIVE sessions are managed manually from back-office and must be preserved.
+            if ("CONVERTED".equals(session.getStatus()) || "CAD_ACTIVE".equals(session.getStatus())) {
                 continue;
             }
 

backend/src/main/java/com/printcalculator/service/SlicerService.java

@@ -2,25 +2,54 @@ package com.printcalculator.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.printcalculator.exception.ModelProcessingException;
 import com.printcalculator.model.ModelDimensions;
 import com.printcalculator.model.PrintStats;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.assimp.AIFace;
+import org.lwjgl.assimp.AIMesh;
+import org.lwjgl.assimp.AIScene;
+import org.lwjgl.assimp.AIVector3D;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.IntBuffer;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.charset.StandardCharsets;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import static org.lwjgl.assimp.Assimp.aiGetErrorString;
+import static org.lwjgl.assimp.Assimp.aiImportFile;
+import static org.lwjgl.assimp.Assimp.aiProcess_JoinIdenticalVertices;
+import static org.lwjgl.assimp.Assimp.aiProcess_PreTransformVertices;
+import static org.lwjgl.assimp.Assimp.aiProcess_SortByPType;
+import static org.lwjgl.assimp.Assimp.aiProcess_Triangulate;
+import static org.lwjgl.assimp.Assimp.aiReleaseImport;
 
 @Service
 public class SlicerService {
@@ -31,16 +60,19 @@ public class SlicerService {
     private static final Pattern SIZE_Z_PATTERN = Pattern.compile("(?m)^\\s*size_z\\s*=\\s*([-+]?\\d+(?:\\.\\d+)?)\\s*$");
 
     private final String trustedSlicerPath;
+    private final String trustedAssimpPath;
     private final ProfileManager profileManager;
     private final GCodeParser gCodeParser;
     private final ObjectMapper mapper;
 
     public SlicerService(
             @Value("${slicer.path}") String slicerPath,
+            @Value("${assimp.path:assimp}") String assimpPath,
             ProfileManager profileManager,
             GCodeParser gCodeParser,
             ObjectMapper mapper) {
         this.trustedSlicerPath = normalizeExecutablePath(slicerPath);
+        this.trustedAssimpPath = normalizeExecutablePath(assimpPath);
         this.profileManager = profileManager;
         this.gCodeParser = gCodeParser;
         this.mapper = mapper;
@@ -87,7 +119,8 @@ public class SlicerService {
             String processProfilePath = requireSafeArgument(pFile.getAbsolutePath(), "process profile path");
             String filamentProfilePath = requireSafeArgument(fFile.getAbsolutePath(), "filament profile path");
             String outputDirPath = requireSafeArgument(tempDir.toAbsolutePath().toString(), "output directory path");
-            String inputStlPath = requireSafeArgument(inputStl.getAbsolutePath(), "input STL path");
+            String inputModelPath = requireSafeArgument(inputStl.getAbsolutePath(), "input model path");
+            List<String> slicerInputPaths = resolveSlicerInputPaths(inputStl, inputModelPath, tempDir);
 
             // 3. Run slicer. Retry with arrange only for out-of-volume style failures.
             for (boolean useArrange : new boolean[]{false, true}) {
@@ -110,7 +143,7 @@ public class SlicerService {
                 command.add("0");
                 command.add("--outputdir");
                 command.add(outputDirPath);
-                command.add(inputStlPath);
+                command.addAll(slicerInputPaths);
 
                 logger.info("Executing Slicer" + (useArrange ? " (retry with arrange)" : "") + ": " + String.join(" ", command));
 
@@ -124,7 +157,10 @@ public class SlicerService {
 
                 if (!finished) {
                     process.destroyForcibly();
-                    throw new IOException("Slicer timed out");
+                    throw new ModelProcessingException(
+                            "SLICER_TIMEOUT",
+                            "Model processing timed out. Try another format or contact us directly via Request Consultation."
+                    );
                 }
 
                 if (process.exitValue() != 0) {
@@ -136,7 +172,11 @@ public class SlicerService {
                         logger.warning("Slicer reported model out of printable area, retrying with arrange.");
                         continue;
                     }
-                    throw new IOException("Slicer failed with exit code " + process.exitValue() + ": " + error);
+                    logger.warning("Slicer failed with exit code " + process.exitValue() + ". Log: " + error);
+                    throw new ModelProcessingException(
+                            "SLICER_EXECUTION_FAILED",
+                            "Unable to process this model. Try another format or contact us directly via Request Consultation."
+                    );
                 }
 
                 File gcodeFile = tempDir.resolve(basename + ".gcode").toFile();
@@ -145,14 +185,20 @@ public class SlicerService {
                     if (alt.exists()) {
                         gcodeFile = alt;
                     } else {
-                        throw new IOException("GCode output not found in " + tempDir);
+                        throw new ModelProcessingException(
+                                "SLICER_OUTPUT_MISSING",
+                                "Unable to generate slicing output for this model. Try another format or contact us directly via Request Consultation."
+                        );
                     }
                 }
 
                 return gCodeParser.parse(gcodeFile);
             }
 
-            throw new IOException("Slicer failed after retry");
+            throw new ModelProcessingException(
+                    "SLICER_FAILED_AFTER_RETRY",
+                    "Unable to process this model. Try another format or contact us directly via Request Consultation."
+            );
 
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -274,6 +320,659 @@ public class SlicerService {
                 || normalized.contains("calc_exclude_triangles");
     }
 
+    private List<String> resolveSlicerInputPaths(File inputModel, String inputModelPath, Path tempDir)
+            throws IOException, InterruptedException {
+        if (!inputModel.getName().toLowerCase().endsWith(".3mf")) {
+            return List.of(inputModelPath);
+        }
+
+        List<String> convertedStlPaths = convert3mfToStlInputPaths(inputModel, tempDir);
+        logger.info("Converted 3MF to " + convertedStlPaths.size() + " STL file(s) for slicing.");
+        return convertedStlPaths;
+    }
+
+    public Path convert3mfToPersistentStl(File input3mf, Path destinationStl) throws IOException {
+        Path tempDir = Files.createTempDirectory("slicer_convert_");
+        try {
+            List<String> convertedPaths = convert3mfToStlInputPaths(input3mf, tempDir);
+            if (convertedPaths.isEmpty()) {
+                throw new ModelProcessingException(
+                        "MODEL_CONVERSION_FAILED",
+                        "Unable to process this 3MF file. Try another format or contact us directly via Request Consultation."
+                );
+            }
+            Path source = Path.of(convertedPaths.get(0));
+            Path parent = destinationStl.toAbsolutePath().normalize().getParent();
+            if (parent != null) {
+                Files.createDirectories(parent);
+            }
+            Files.copy(source, destinationStl, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+            return destinationStl;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException("Interrupted during 3MF conversion", e);
+        } finally {
+            deleteRecursively(tempDir);
+        }
+    }
+
+    private List<String> convert3mfToStlInputPaths(File input3mf, Path tempDir) throws IOException, InterruptedException {
+        Path conversionOutputDir = tempDir.resolve("converted-from-3mf");
+        Files.createDirectories(conversionOutputDir);
+
+        String conversionOutputStlPath = requireSafeArgument(
+                conversionOutputDir.resolve("converted.stl").toAbsolutePath().toString(),
+                "3MF conversion output STL path"
+        );
+        String conversionOutputObjPath = requireSafeArgument(
+                conversionOutputDir.resolve("converted.obj").toAbsolutePath().toString(),
+                "3MF conversion output OBJ path"
+        );
+        String input3mfPath = requireSafeArgument(input3mf.getAbsolutePath(), "input 3MF path");
+
+        String stlLog = "";
+        String objLog = "";
+
+        Path lwjglConvertedStl = conversionOutputDir.resolve("converted-lwjgl.stl");
+        try {
+            long lwjglTriangles = convert3mfToStlWithLwjglAssimp(input3mf.toPath(), lwjglConvertedStl);
+            if (lwjglTriangles > 0 && hasRenderableGeometry(lwjglConvertedStl)) {
+                logger.info("Converted 3MF to STL via LWJGL Assimp. Triangles: " + lwjglTriangles);
+                return List.of(lwjglConvertedStl.toString());
+            }
+            logger.warning("LWJGL Assimp conversion produced no renderable geometry.");
+        } catch (Exception | LinkageError e) {
+            logger.warning("LWJGL Assimp conversion failed, falling back to assimp CLI: " + e.getMessage());
+        }
+
+        Path convertedStl = Path.of(conversionOutputStlPath);
+        try {
+            stlLog = runAssimpExport(input3mfPath, conversionOutputStlPath, tempDir.resolve("assimp-convert-stl.log"));
+            if (hasRenderableGeometry(convertedStl)) {
+                return List.of(convertedStl.toString());
+            }
+            logger.warning("Assimp STL conversion produced empty geometry.");
+        } catch (IOException e) {
+            stlLog = e.getMessage() != null ? e.getMessage() : "";
+            logger.warning("Assimp STL conversion failed, trying alternate conversion paths: " + stlLog);
+        }
+
+        logger.warning("Retrying 3MF conversion to OBJ.");
+
+        Path convertedObj = Path.of(conversionOutputObjPath);
+        try {
+            objLog = runAssimpExport(input3mfPath, conversionOutputObjPath, tempDir.resolve("assimp-convert-obj.log"));
+            if (hasRenderableGeometry(convertedObj)) {
+                Path stlFromObj = conversionOutputDir.resolve("converted-from-obj.stl");
+                runAssimpExport(
+                        convertedObj.toString(),
+                        stlFromObj.toString(),
+                        tempDir.resolve("assimp-convert-obj-to-stl.log")
+                );
+                if (hasRenderableGeometry(stlFromObj)) {
+                    return List.of(stlFromObj.toString());
+                }
+                logger.warning("Assimp OBJ->STL conversion produced empty geometry.");
+            }
+            logger.warning("Assimp OBJ conversion produced empty geometry.");
+        } catch (IOException e) {
+            objLog = e.getMessage() != null ? e.getMessage() : "";
+            logger.warning("Assimp OBJ conversion failed: " + objLog);
+        }
+
+        Path fallbackStl = conversionOutputDir.resolve("converted-fallback.stl");
+        try {
+            long fallbackTriangles = convert3mfArchiveToAsciiStl(input3mf.toPath(), fallbackStl);
+            if (fallbackTriangles > 0 && hasRenderableGeometry(fallbackStl)) {
+                logger.warning("Assimp conversion produced empty geometry. Fallback 3MF XML extractor generated "
+                        + fallbackTriangles + " triangles.");
+                return List.of(fallbackStl.toString());
+            }
+            logger.warning("3MF XML fallback completed but produced no renderable triangles.");
+        } catch (IOException e) {
+            logger.warning("3MF XML fallback conversion failed: " + e.getMessage());
+        }
+
+        throw new ModelProcessingException(
+                "MODEL_CONVERSION_FAILED",
+                "Unable to process this 3MF file. Try another format or contact us directly via Request Consultation."
+        );
+    }
+
+    private long convert3mfToStlWithLwjglAssimp(Path input3mf, Path outputStl) throws IOException {
+        int flags = aiProcess_Triangulate
+                | aiProcess_JoinIdenticalVertices
+                | aiProcess_PreTransformVertices
+                | aiProcess_SortByPType;
+        AIScene scene = aiImportFile(input3mf.toString(), flags);
+        if (scene == null) {
+            throw new IOException("LWJGL Assimp import failed: " + aiGetErrorString());
+        }
+
+        long triangleCount = 0L;
+        try (BufferedWriter writer = Files.newBufferedWriter(outputStl, StandardCharsets.UTF_8)) {
+            writer.write("solid converted\n");
+
+            int meshCount = scene.mNumMeshes();
+            PointerBuffer meshPointers = scene.mMeshes();
+            if (meshCount <= 0 || meshPointers == null) {
+                throw new IOException("LWJGL Assimp import contains no meshes");
+            }
+
+            for (int meshIndex = 0; meshIndex < meshCount; meshIndex++) {
+                long meshPtr = meshPointers.get(meshIndex);
+                if (meshPtr == 0L) {
+                    continue;
+                }
+                AIMesh mesh = AIMesh.create(meshPtr);
+                AIVector3D.Buffer vertices = mesh.mVertices();
+                AIFace.Buffer faces = mesh.mFaces();
+                if (vertices == null || faces == null) {
+                    continue;
+                }
+
+                int vertexCount = mesh.mNumVertices();
+                int faceCount = mesh.mNumFaces();
+                for (int faceIndex = 0; faceIndex < faceCount; faceIndex++) {
+                    AIFace face = faces.get(faceIndex);
+                    if (face.mNumIndices() != 3) {
+                        continue;
+                    }
+                    IntBuffer indices = face.mIndices();
+                    if (indices == null || indices.remaining() < 3) {
+                        continue;
+                    }
+                    int i0 = indices.get(0);
+                    int i1 = indices.get(1);
+                    int i2 = indices.get(2);
+                    if (i0 < 0 || i1 < 0 || i2 < 0
+                            || i0 >= vertexCount
+                            || i1 >= vertexCount
+                            || i2 >= vertexCount) {
+                        continue;
+                    }
+
+                    Vec3 p1 = toVec3(vertices.get(i0));
+                    Vec3 p2 = toVec3(vertices.get(i1));
+                    Vec3 p3 = toVec3(vertices.get(i2));
+                    writeAsciiFacet(writer, p1, p2, p3);
+                    triangleCount++;
+                }
+            }
+
+            writer.write("endsolid converted\n");
+        } finally {
+            aiReleaseImport(scene);
+        }
+
+        if (triangleCount <= 0) {
+            throw new IOException("LWJGL Assimp conversion produced no triangles");
+        }
+        return triangleCount;
+    }
+
+    private String runAssimpExport(String input3mfPath, String outputModelPath, Path conversionLogPath)
+            throws IOException, InterruptedException {
+        ProcessBuilder conversionPb = new ProcessBuilder();
+        List<String> conversionCommand = conversionPb.command();
+        conversionCommand.add(trustedAssimpPath);
+        conversionCommand.add("export");
+        conversionCommand.add(input3mfPath);
+        conversionCommand.add(outputModelPath);
+
+        logger.info("Converting 3MF with Assimp: " + String.join(" ", conversionCommand));
+
+        Files.deleteIfExists(conversionLogPath);
+        conversionPb.redirectErrorStream(true);
+        conversionPb.redirectOutput(conversionLogPath.toFile());
+
+        Process conversionProcess = conversionPb.start();
+        boolean conversionFinished = conversionProcess.waitFor(3, TimeUnit.MINUTES);
+        if (!conversionFinished) {
+            conversionProcess.destroyForcibly();
+            throw new IOException("3MF conversion timed out");
+        }
+
+        String conversionLog = Files.exists(conversionLogPath)
+                ? Files.readString(conversionLogPath, StandardCharsets.UTF_8)
+                : "";
+        if (conversionProcess.exitValue() != 0) {
+            throw new IOException("3MF conversion failed with exit code "
+                    + conversionProcess.exitValue() + ": " + conversionLog);
+        }
+        return conversionLog;
+    }
+
+    private boolean hasRenderableGeometry(Path modelPath) throws IOException {
+        if (!Files.isRegularFile(modelPath) || Files.size(modelPath) == 0) {
+            return false;
+        }
+
+        String fileName = modelPath.getFileName().toString().toLowerCase();
+        if (fileName.endsWith(".obj")) {
+            try (var lines = Files.lines(modelPath)) {
+                return lines.map(String::trim).anyMatch(line -> line.startsWith("f "));
+            }
+        }
+
+        if (fileName.endsWith(".stl")) {
+            long size = Files.size(modelPath);
+            if (size <= 84) {
+                return false;
+            }
+            byte[] header = new byte[84];
+            try (InputStream is = Files.newInputStream(modelPath)) {
+                int read = is.read(header);
+                if (read < 84) {
+                    return false;
+                }
+            }
+            long triangleCount = ((long) (header[80] & 0xff))
+                    | (((long) (header[81] & 0xff)) << 8)
+                    | (((long) (header[82] & 0xff)) << 16)
+                    | (((long) (header[83] & 0xff)) << 24);
+            if (triangleCount > 0) {
+                return true;
+            }
+            try (var lines = Files.lines(modelPath)) {
+                return lines.limit(2000).anyMatch(line -> line.contains("facet normal"));
+            }
+        }
+
+        return true;
+    }
+
+    private long convert3mfArchiveToAsciiStl(Path input3mf, Path outputStl) throws IOException {
+        Map<String, ThreeMfModelDocument> modelCache = new HashMap<>();
+        long[] triangleCount = new long[]{0L};
+
+        try (ZipFile zipFile = new ZipFile(input3mf.toFile());
+             BufferedWriter writer = Files.newBufferedWriter(outputStl, StandardCharsets.UTF_8)) {
+            writer.write("solid converted\n");
+
+            ThreeMfModelDocument rootModel = loadThreeMfModel(zipFile, modelCache, "3D/3dmodel.model");
+            Element build = findFirstChildByLocalName(rootModel.rootElement(), "build");
+            if (build == null) {
+                throw new IOException("3MF build section not found in root model");
+            }
+
+            for (Element item : findChildrenByLocalName(build, "item")) {
+                if ("0".equals(getAttributeByLocalName(item, "printable"))) {
+                    continue;
+                }
+                String objectId = getAttributeByLocalName(item, "objectid");
+                if (objectId == null || objectId.isBlank()) {
+                    continue;
+                }
+                Transform itemTransform = parseTransform(getAttributeByLocalName(item, "transform"));
+                writeObjectTriangles(
+                        zipFile,
+                        modelCache,
+                        rootModel.modelPath(),
+                        objectId,
+                        itemTransform,
+                        writer,
+                        triangleCount,
+                        new HashSet<>(),
+                        0
+                );
+            }
+
+            writer.write("endsolid converted\n");
+        } catch (IOException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new IOException("3MF fallback conversion failed: " + e.getMessage(), e);
+        }
+
+        return triangleCount[0];
+    }
+
+    private void writeObjectTriangles(
+            ZipFile zipFile,
+            Map<String, ThreeMfModelDocument> modelCache,
+            String modelPath,
+            String objectId,
+            Transform transform,
+            BufferedWriter writer,
+            long[] triangleCount,
+            Set<String> recursionGuard,
+            int depth
+    ) throws Exception {
+        if (depth > 64) {
+            throw new IOException("3MF component nesting too deep");
+        }
+
+        String guardKey = modelPath + "#" + objectId;
+        if (!recursionGuard.add(guardKey)) {
+            return;
+        }
+
+        try {
+            ThreeMfModelDocument modelDocument = loadThreeMfModel(zipFile, modelCache, modelPath);
+            Element objectElement = modelDocument.objectsById().get(objectId);
+            if (objectElement == null) {
+                return;
+            }
+
+            Element mesh = findFirstChildByLocalName(objectElement, "mesh");
+            if (mesh != null) {
+                writeMeshTriangles(mesh, transform, writer, triangleCount);
+            }
+
+            Element components = findFirstChildByLocalName(objectElement, "components");
+            if (components != null) {
+                for (Element component : findChildrenByLocalName(components, "component")) {
+                    String childObjectId = getAttributeByLocalName(component, "objectid");
+                    if (childObjectId == null || childObjectId.isBlank()) {
+                        continue;
+                    }
+                    String componentPath = getAttributeByLocalName(component, "path");
+                    String resolvedModelPath = (componentPath == null || componentPath.isBlank())
+                            ? modelDocument.modelPath()
+                            : normalizeZipPath(componentPath);
+                    Transform componentTransform = parseTransform(getAttributeByLocalName(component, "transform"));
+                    Transform combinedTransform = transform.multiply(componentTransform);
+
+                    writeObjectTriangles(
+                            zipFile,
+                            modelCache,
+                            resolvedModelPath,
+                            childObjectId,
+                            combinedTransform,
+                            writer,
+                            triangleCount,
+                            recursionGuard,
+                            depth + 1
+                    );
+                }
+            }
+        } finally {
+            recursionGuard.remove(guardKey);
+        }
+    }
+
+    private void writeMeshTriangles(
+            Element meshElement,
+            Transform transform,
+            BufferedWriter writer,
+            long[] triangleCount
+    ) throws IOException {
+        Element verticesElement = findFirstChildByLocalName(meshElement, "vertices");
+        Element trianglesElement = findFirstChildByLocalName(meshElement, "triangles");
+        if (verticesElement == null || trianglesElement == null) {
+            return;
+        }
+
+        List<Vec3> vertices = new java.util.ArrayList<>();
+        for (Element vertex : findChildrenByLocalName(verticesElement, "vertex")) {
+            Double x = parseDoubleAttribute(vertex, "x");
+            Double y = parseDoubleAttribute(vertex, "y");
+            Double z = parseDoubleAttribute(vertex, "z");
+            if (x == null || y == null || z == null) {
+                continue;
+            }
+            vertices.add(new Vec3(x, y, z));
+        }
+
+        if (vertices.isEmpty()) {
+            return;
+        }
+
+        for (Element triangle : findChildrenByLocalName(trianglesElement, "triangle")) {
+            Integer v1 = parseIntAttribute(triangle, "v1");
+            Integer v2 = parseIntAttribute(triangle, "v2");
+            Integer v3 = parseIntAttribute(triangle, "v3");
+            if (v1 == null || v2 == null || v3 == null) {
+                continue;
+            }
+            if (v1 < 0 || v2 < 0 || v3 < 0 || v1 >= vertices.size() || v2 >= vertices.size() || v3 >= vertices.size()) {
+                continue;
+            }
+
+            Vec3 p1 = transform.apply(vertices.get(v1));
+            Vec3 p2 = transform.apply(vertices.get(v2));
+            Vec3 p3 = transform.apply(vertices.get(v3));
+            writeAsciiFacet(writer, p1, p2, p3);
+            triangleCount[0]++;
+        }
+    }
+
+    private void writeAsciiFacet(BufferedWriter writer, Vec3 p1, Vec3 p2, Vec3 p3) throws IOException {
+        Vec3 normal = computeNormal(p1, p2, p3);
+        writer.write("facet normal " + normal.x() + " " + normal.y() + " " + normal.z() + "\n");
+        writer.write(" outer loop\n");
+        writer.write("  vertex " + p1.x() + " " + p1.y() + " " + p1.z() + "\n");
+        writer.write("  vertex " + p2.x() + " " + p2.y() + " " + p2.z() + "\n");
+        writer.write("  vertex " + p3.x() + " " + p3.y() + " " + p3.z() + "\n");
+        writer.write(" endloop\n");
+        writer.write("endfacet\n");
+    }
+
+    private Vec3 toVec3(AIVector3D v) {
+        return new Vec3(v.x(), v.y(), v.z());
+    }
+
+    private Vec3 computeNormal(Vec3 a, Vec3 b, Vec3 c) {
+        double ux = b.x() - a.x();
+        double uy = b.y() - a.y();
+        double uz = b.z() - a.z();
+        double vx = c.x() - a.x();
+        double vy = c.y() - a.y();
+        double vz = c.z() - a.z();
+
+        double nx = uy * vz - uz * vy;
+        double ny = uz * vx - ux * vz;
+        double nz = ux * vy - uy * vx;
+        double length = Math.sqrt(nx * nx + ny * ny + nz * nz);
+        if (length <= 1e-12) {
+            return new Vec3(0.0, 0.0, 0.0);
+        }
+        return new Vec3(nx / length, ny / length, nz / length);
+    }
+
+    private ThreeMfModelDocument loadThreeMfModel(
+            ZipFile zipFile,
+            Map<String, ThreeMfModelDocument> modelCache,
+            String modelPath
+    ) throws Exception {
+        String normalizedPath = normalizeZipPath(modelPath);
+        ThreeMfModelDocument cached = modelCache.get(normalizedPath);
+        if (cached != null) {
+            return cached;
+        }
+
+        ZipEntry entry = zipFile.getEntry(normalizedPath);
+        if (entry == null) {
+            throw new IOException("3MF model entry not found: " + normalizedPath);
+        }
+
+        Document document = parseXmlDocument(zipFile, entry);
+        Element root = document.getDocumentElement();
+        Map<String, Element> objectsById = new HashMap<>();
+        Element resources = findFirstChildByLocalName(root, "resources");
+        if (resources != null) {
+            for (Element objectElement : findChildrenByLocalName(resources, "object")) {
+                String id = getAttributeByLocalName(objectElement, "id");
+                if (id != null && !id.isBlank()) {
+                    objectsById.put(id, objectElement);
+                }
+            }
+        }
+
+        ThreeMfModelDocument loaded = new ThreeMfModelDocument(normalizedPath, root, objectsById);
+        modelCache.put(normalizedPath, loaded);
+        return loaded;
+    }
+
+    private Document parseXmlDocument(ZipFile zipFile, ZipEntry entry) throws Exception {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        try {
+            dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        } catch (Exception ignored) {
+            // Best-effort hardening.
+        }
+        try {
+            dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        } catch (Exception ignored) {
+            // Best-effort hardening.
+        }
+        dbf.setXIncludeAware(false);
+        dbf.setExpandEntityReferences(false);
+
+        try (InputStream is = zipFile.getInputStream(entry)) {
+            return dbf.newDocumentBuilder().parse(is);
+        }
+    }
+
+    private String normalizeZipPath(String rawPath) throws IOException {
+        if (rawPath == null || rawPath.isBlank()) {
+            throw new IOException("Invalid empty 3MF model path");
+        }
+        String normalized = rawPath.trim().replace("\\", "/");
+        while (normalized.startsWith("/")) {
+            normalized = normalized.substring(1);
+        }
+        if (normalized.contains("..")) {
+            throw new IOException("Invalid 3MF model path: " + rawPath);
+        }
+        return normalized;
+    }
+
+    private List<Element> findChildrenByLocalName(Element parent, String localName) {
+        List<Element> result = new java.util.ArrayList<>();
+        NodeList children = parent.getChildNodes();
+        for (int i = 0; i < children.getLength(); i++) {
+            Node node = children.item(i);
+            if (node.getNodeType() == Node.ELEMENT_NODE) {
+                Element element = (Element) node;
+                String nodeLocalName = element.getLocalName() != null ? element.getLocalName() : element.getTagName();
+                if (localName.equals(nodeLocalName)) {
+                    result.add(element);
+                }
+            }
+        }
+        return result;
+    }
+
+    private Element findFirstChildByLocalName(Element parent, String localName) {
+        NodeList children = parent.getChildNodes();
+        for (int i = 0; i < children.getLength(); i++) {
+            Node node = children.item(i);
+            if (node.getNodeType() == Node.ELEMENT_NODE) {
+                Element element = (Element) node;
+                String nodeLocalName = element.getLocalName() != null ? element.getLocalName() : element.getTagName();
+                if (localName.equals(nodeLocalName)) {
+                    return element;
+                }
+            }
+        }
+        return null;
+    }
+
+    private String getAttributeByLocalName(Element element, String localName) {
+        if (element.hasAttribute(localName)) {
+            return element.getAttribute(localName);
+        }
+        NamedNodeMap attrs = element.getAttributes();
+        for (int i = 0; i < attrs.getLength(); i++) {
+            Node attr = attrs.item(i);
+            String attrLocal = attr.getLocalName() != null ? attr.getLocalName() : attr.getNodeName();
+            if (localName.equals(attrLocal)) {
+                return attr.getNodeValue();
+            }
+        }
+        return null;
+    }
+
+    private Double parseDoubleAttribute(Element element, String attributeName) {
+        String value = getAttributeByLocalName(element, attributeName);
+        if (value == null || value.isBlank()) {
+            return null;
+        }
+        try {
+            return Double.parseDouble(value);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+    }
+
+    private Integer parseIntAttribute(Element element, String attributeName) {
+        String value = getAttributeByLocalName(element, attributeName);
+        if (value == null || value.isBlank()) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+    }
+
+    private Transform parseTransform(String rawTransform) throws IOException {
+        if (rawTransform == null || rawTransform.isBlank()) {
+            return Transform.identity();
+        }
+        String[] tokens = rawTransform.trim().split("\\s+");
+        if (tokens.length != 12) {
+            throw new IOException("Invalid 3MF transform format: " + rawTransform);
+        }
+        double[] v = new double[12];
+        for (int i = 0; i < 12; i++) {
+            try {
+                v[i] = Double.parseDouble(tokens[i]);
+            } catch (NumberFormatException e) {
+                throw new IOException("Invalid number in 3MF transform: " + rawTransform, e);
+            }
+        }
+        return new Transform(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11]);
+    }
+
+    private record ThreeMfModelDocument(String modelPath, Element rootElement, Map<String, Element> objectsById) {
+    }
+
+    private record Vec3(double x, double y, double z) {
+    }
+
+    private record Transform(
+            double m00, double m01, double m02,
+            double m10, double m11, double m12,
+            double m20, double m21, double m22,
+            double tx, double ty, double tz
+    ) {
+        static Transform identity() {
+            return new Transform(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0);
+        }
+
+        Transform multiply(Transform other) {
+            return new Transform(
+                    m00 * other.m00 + m01 * other.m10 + m02 * other.m20,
+                    m00 * other.m01 + m01 * other.m11 + m02 * other.m21,
+                    m00 * other.m02 + m01 * other.m12 + m02 * other.m22,
+                    m10 * other.m00 + m11 * other.m10 + m12 * other.m20,
+                    m10 * other.m01 + m11 * other.m11 + m12 * other.m21,
+                    m10 * other.m02 + m11 * other.m12 + m12 * other.m22,
+                    m20 * other.m00 + m21 * other.m10 + m22 * other.m20,
+                    m20 * other.m01 + m21 * other.m11 + m22 * other.m21,
+                    m20 * other.m02 + m21 * other.m12 + m22 * other.m22,
+                    m00 * other.tx + m01 * other.ty + m02 * other.tz + tx,
+                    m10 * other.tx + m11 * other.ty + m12 * other.tz + ty,
+                    m20 * other.tx + m21 * other.ty + m22 * other.tz + tz
+            );
+        }
+
+        Vec3 apply(Vec3 v) {
+            return new Vec3(
+                    m00 * v.x() + m01 * v.y() + m02 * v.z() + tx,
+                    m10 * v.x() + m11 * v.y() + m12 * v.z() + ty,
+                    m20 * v.x() + m21 * v.y() + m22 * v.z() + tz
+            );
+        }
+    }
+
     private String normalizeExecutablePath(String configuredPath) {
         if (configuredPath == null || configuredPath.isBlank()) {
             throw new IllegalArgumentException("slicer.path is required");

backend/src/main/java/com/printcalculator/service/order/AdminOrderControllerService.java

@@ -0,0 +1,423 @@
+package com.printcalculator.service.order;
+
+import com.printcalculator.dto.AddressDto;
+import com.printcalculator.dto.AdminOrderStatusUpdateRequest;
+import com.printcalculator.dto.OrderDto;
+import com.printcalculator.dto.OrderItemDto;
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.OrderItem;
+import com.printcalculator.entity.Payment;
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.event.OrderShippedEvent;
+import com.printcalculator.repository.OrderItemRepository;
+import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.PaymentRepository;
+import com.printcalculator.repository.QuoteLineItemRepository;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.PaymentService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+
+@Service
+@Transactional(readOnly = true)
+public class AdminOrderControllerService {
+    private static final Path QUOTE_STORAGE_ROOT = Paths.get("storage_quotes").toAbsolutePath().normalize();
+    private static final List<String> ALLOWED_ORDER_STATUSES = List.of(
+            "PENDING_PAYMENT",
+            "PAID",
+            "IN_PRODUCTION",
+            "SHIPPED",
+            "COMPLETED",
+            "CANCELLED"
+    );
+
+    private final OrderRepository orderRepo;
+    private final OrderItemRepository orderItemRepo;
+    private final PaymentRepository paymentRepo;
+    private final QuoteLineItemRepository quoteLineItemRepo;
+    private final PaymentService paymentService;
+    private final StorageService storageService;
+    private final InvoicePdfRenderingService invoiceService;
+    private final QrBillService qrBillService;
+    private final ApplicationEventPublisher eventPublisher;
+
+    public AdminOrderControllerService(OrderRepository orderRepo,
+                                       OrderItemRepository orderItemRepo,
+                                       PaymentRepository paymentRepo,
+                                       QuoteLineItemRepository quoteLineItemRepo,
+                                       PaymentService paymentService,
+                                       StorageService storageService,
+                                       InvoicePdfRenderingService invoiceService,
+                                       QrBillService qrBillService,
+                                       ApplicationEventPublisher eventPublisher) {
+        this.orderRepo = orderRepo;
+        this.orderItemRepo = orderItemRepo;
+        this.paymentRepo = paymentRepo;
+        this.quoteLineItemRepo = quoteLineItemRepo;
+        this.paymentService = paymentService;
+        this.storageService = storageService;
+        this.invoiceService = invoiceService;
+        this.qrBillService = qrBillService;
+        this.eventPublisher = eventPublisher;
+    }
+
+    public List<OrderDto> listOrders() {
+        return orderRepo.findAllByOrderByCreatedAtDesc()
+                .stream()
+                .map(this::toOrderDto)
+                .toList();
+    }
+
+    public OrderDto getOrder(UUID orderId) {
+        return toOrderDto(getOrderOrThrow(orderId));
+    }
+
+    @Transactional
+    public OrderDto updatePaymentMethod(UUID orderId, Map<String, String> payload) {
+        getOrderOrThrow(orderId);
+        String method = payload != null ? payload.get("method") : null;
+        if (method == null || method.isBlank()) {
+            throw new ResponseStatusException(BAD_REQUEST, "Payment method is required");
+        }
+        paymentService.updatePaymentMethod(orderId, method);
+        return toOrderDto(getOrderOrThrow(orderId));
+    }
+
+    @Transactional
+    public OrderDto updateOrderStatus(UUID orderId, AdminOrderStatusUpdateRequest payload) {
+        if (payload == null || payload.getStatus() == null || payload.getStatus().isBlank()) {
+            throw new ResponseStatusException(BAD_REQUEST, "Status is required");
+        }
+
+        Order order = getOrderOrThrow(orderId);
+        String normalizedStatus = payload.getStatus().trim().toUpperCase(Locale.ROOT);
+        if (!ALLOWED_ORDER_STATUSES.contains(normalizedStatus)) {
+            throw new ResponseStatusException(
+                    BAD_REQUEST,
+                    "Invalid order status. Allowed values: " + String.join(", ", ALLOWED_ORDER_STATUSES)
+            );
+        }
+        String previousStatus = order.getStatus();
+        order.setStatus(normalizedStatus);
+        Order savedOrder = orderRepo.save(order);
+
+        if (!"SHIPPED".equals(previousStatus) && "SHIPPED".equals(normalizedStatus)) {
+            eventPublisher.publishEvent(new OrderShippedEvent(this, savedOrder));
+        }
+
+        return toOrderDto(savedOrder);
+    }
+
+    public ResponseEntity<Resource> downloadOrderItemFile(UUID orderId, UUID orderItemId) {
+        OrderItem item = orderItemRepo.findById(orderItemId)
+                .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order item not found"));
+
+        if (!item.getOrder().getId().equals(orderId)) {
+            throw new ResponseStatusException(NOT_FOUND, "Order item not found for order");
+        }
+
+        String relativePath = item.getStoredRelativePath();
+        if (relativePath == null || relativePath.isBlank() || "PENDING".equals(relativePath)) {
+            throw new ResponseStatusException(NOT_FOUND, "File not available");
+        }
+        Path safeRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
+        if (safeRelativePath == null) {
+            throw new ResponseStatusException(NOT_FOUND, "File not available");
+        }
+
+        try {
+            Resource resource = loadOrderItemResourceWithRecovery(item, safeRelativePath);
+            MediaType contentType = MediaType.APPLICATION_OCTET_STREAM;
+            if (item.getMimeType() != null && !item.getMimeType().isBlank()) {
+                try {
+                    contentType = MediaType.parseMediaType(item.getMimeType());
+                } catch (Exception ignored) {
+                    contentType = MediaType.APPLICATION_OCTET_STREAM;
+                }
+            }
+
+            String filename = item.getOriginalFilename() != null && !item.getOriginalFilename().isBlank()
+                    ? item.getOriginalFilename()
+                    : "order-item-" + orderItemId;
+
+            return ResponseEntity.ok()
+                    .contentType(contentType)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment()
+                            .filename(filename, StandardCharsets.UTF_8)
+                            .build()
+                            .toString())
+                    .body(resource);
+        } catch (ResponseStatusException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new ResponseStatusException(NOT_FOUND, "File not available");
+        }
+    }
+
+    public ResponseEntity<byte[]> downloadOrderConfirmation(UUID orderId) {
+        return generateDocument(getOrderOrThrow(orderId), true);
+    }
+
+    public ResponseEntity<byte[]> downloadOrderInvoice(UUID orderId) {
+        return generateDocument(getOrderOrThrow(orderId), false);
+    }
+
+    private Order getOrderOrThrow(UUID orderId) {
+        return orderRepo.findById(orderId)
+                .orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Order not found"));
+    }
+
+    private OrderDto toOrderDto(Order order) {
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+        OrderDto dto = new OrderDto();
+        dto.setId(order.getId());
+        dto.setOrderNumber(getDisplayOrderNumber(order));
+        dto.setStatus(order.getStatus());
+
+        paymentRepo.findByOrder_Id(order.getId()).ifPresent(payment -> {
+            dto.setPaymentStatus(payment.getStatus());
+            dto.setPaymentMethod(payment.getMethod());
+        });
+
+        dto.setCustomerEmail(order.getCustomerEmail());
+        dto.setCustomerPhone(order.getCustomerPhone());
+        dto.setPreferredLanguage(order.getPreferredLanguage());
+        dto.setBillingCustomerType(order.getBillingCustomerType());
+        dto.setCurrency(order.getCurrency());
+        dto.setSetupCostChf(order.getSetupCostChf());
+        dto.setShippingCostChf(order.getShippingCostChf());
+        dto.setDiscountChf(order.getDiscountChf());
+        dto.setSubtotalChf(order.getSubtotalChf());
+        dto.setIsCadOrder(order.getIsCadOrder());
+        dto.setSourceRequestId(order.getSourceRequestId());
+        dto.setCadHours(order.getCadHours());
+        dto.setCadHourlyRateChf(order.getCadHourlyRateChf());
+        dto.setCadTotalChf(order.getCadTotalChf());
+        dto.setTotalChf(order.getTotalChf());
+        dto.setCreatedAt(order.getCreatedAt());
+        dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
+        QuoteSession sourceSession = order.getSourceQuoteSession();
+        if (sourceSession != null) {
+            dto.setPrintMaterialCode(sourceSession.getMaterialCode());
+            dto.setPrintNozzleDiameterMm(sourceSession.getNozzleDiameterMm());
+            dto.setPrintLayerHeightMm(sourceSession.getLayerHeightMm());
+            dto.setPrintInfillPattern(sourceSession.getInfillPattern());
+            dto.setPrintInfillPercent(sourceSession.getInfillPercent());
+            dto.setPrintSupportsEnabled(sourceSession.getSupportsEnabled());
+        }
+
+        AddressDto billing = new AddressDto();
+        billing.setFirstName(order.getBillingFirstName());
+        billing.setLastName(order.getBillingLastName());
+        billing.setCompanyName(order.getBillingCompanyName());
+        billing.setContactPerson(order.getBillingContactPerson());
+        billing.setAddressLine1(order.getBillingAddressLine1());
+        billing.setAddressLine2(order.getBillingAddressLine2());
+        billing.setZip(order.getBillingZip());
+        billing.setCity(order.getBillingCity());
+        billing.setCountryCode(order.getBillingCountryCode());
+        dto.setBillingAddress(billing);
+
+        if (!Boolean.TRUE.equals(order.getShippingSameAsBilling())) {
+            AddressDto shipping = new AddressDto();
+            shipping.setFirstName(order.getShippingFirstName());
+            shipping.setLastName(order.getShippingLastName());
+            shipping.setCompanyName(order.getShippingCompanyName());
+            shipping.setContactPerson(order.getShippingContactPerson());
+            shipping.setAddressLine1(order.getShippingAddressLine1());
+            shipping.setAddressLine2(order.getShippingAddressLine2());
+            shipping.setZip(order.getShippingZip());
+            shipping.setCity(order.getShippingCity());
+            shipping.setCountryCode(order.getShippingCountryCode());
+            dto.setShippingAddress(shipping);
+        }
+
+        List<OrderItemDto> itemDtos = items.stream().map(item -> {
+            OrderItemDto itemDto = new OrderItemDto();
+            itemDto.setId(item.getId());
+            itemDto.setOriginalFilename(item.getOriginalFilename());
+            itemDto.setMaterialCode(item.getMaterialCode());
+            itemDto.setColorCode(item.getColorCode());
+            itemDto.setQuantity(item.getQuantity());
+            itemDto.setPrintTimeSeconds(item.getPrintTimeSeconds());
+            itemDto.setMaterialGrams(item.getMaterialGrams());
+            itemDto.setUnitPriceChf(item.getUnitPriceChf());
+            itemDto.setLineTotalChf(item.getLineTotalChf());
+            return itemDto;
+        }).toList();
+        dto.setItems(itemDtos);
+
+        return dto;
+    }
+
+    private String getDisplayOrderNumber(Order order) {
+        String orderNumber = order.getOrderNumber();
+        if (orderNumber != null && !orderNumber.isBlank()) {
+            return orderNumber;
+        }
+        return order.getId() != null ? order.getId().toString() : "unknown";
+    }
+
+    private ResponseEntity<byte[]> generateDocument(Order order, boolean isConfirmation) {
+        String displayOrderNumber = getDisplayOrderNumber(order);
+        if (isConfirmation) {
+            Path relativePath = buildConfirmationPdfRelativePath(order.getId(), displayOrderNumber);
+            try {
+                byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
+                return ResponseEntity.ok()
+                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"confirmation-" + displayOrderNumber + ".pdf\"")
+                        .contentType(MediaType.APPLICATION_PDF)
+                        .body(existingPdf);
+            } catch (Exception ignored) {
+                // fallback to generated confirmation document
+            }
+        }
+
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+        Payment payment = paymentRepo.findByOrder_Id(order.getId()).orElse(null);
+        byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
+
+        String prefix = isConfirmation ? "confirmation-" : "invoice-";
+        return ResponseEntity.ok()
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + prefix + displayOrderNumber + ".pdf\"")
+                .contentType(MediaType.APPLICATION_PDF)
+                .body(pdf);
+    }
+
+    private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
+        try {
+            Path candidate = Path.of(storedRelativePath).normalize();
+            if (candidate.isAbsolute()) {
+                return null;
+            }
+            Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
+            if (!candidate.startsWith(expectedPrefix)) {
+                return null;
+            }
+            return candidate;
+        } catch (InvalidPathException e) {
+            return null;
+        }
+    }
+
+    private Resource loadOrderItemResourceWithRecovery(OrderItem item, Path safeRelativePath) {
+        try {
+            return storageService.loadAsResource(safeRelativePath);
+        } catch (Exception primaryFailure) {
+            Path sourceQuotePath = resolveFallbackQuoteItemPath(item);
+            if (sourceQuotePath == null) {
+                throw new ResponseStatusException(NOT_FOUND, "File not available");
+            }
+            try {
+                storageService.store(sourceQuotePath, safeRelativePath);
+                return storageService.loadAsResource(safeRelativePath);
+            } catch (Exception copyFailure) {
+                try {
+                    Resource quoteResource = new UrlResource(sourceQuotePath.toUri());
+                    if (quoteResource.exists() || quoteResource.isReadable()) {
+                        return quoteResource;
+                    }
+                } catch (Exception ignored) {
+                    // fall through to 404
+                }
+                throw new ResponseStatusException(NOT_FOUND, "File not available");
+            }
+        }
+    }
+
+    private Path resolveFallbackQuoteItemPath(OrderItem orderItem) {
+        Order order = orderItem.getOrder();
+        QuoteSession sourceSession = order != null ? order.getSourceQuoteSession() : null;
+        UUID sourceSessionId = sourceSession != null ? sourceSession.getId() : null;
+        if (sourceSessionId == null) {
+            return null;
+        }
+
+        String targetFilename = normalizeFilename(orderItem.getOriginalFilename());
+        if (targetFilename == null) {
+            return null;
+        }
+
+        return quoteLineItemRepo.findByQuoteSessionId(sourceSessionId).stream()
+                .filter(quoteItem -> targetFilename.equals(normalizeFilename(quoteItem.getOriginalFilename())))
+                .sorted(Comparator.comparingInt((QuoteLineItem quoteItem) -> scoreQuoteMatch(orderItem, quoteItem)).reversed())
+                .map(quoteItem -> resolveStoredQuotePath(quoteItem.getStoredPath(), sourceSessionId))
+                .filter(path -> path != null && Files.exists(path))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private int scoreQuoteMatch(OrderItem orderItem, QuoteLineItem quoteItem) {
+        int score = 0;
+        if (orderItem.getQuantity() != null && orderItem.getQuantity().equals(quoteItem.getQuantity())) {
+            score += 4;
+        }
+        if (orderItem.getPrintTimeSeconds() != null && orderItem.getPrintTimeSeconds().equals(quoteItem.getPrintTimeSeconds())) {
+            score += 3;
+        }
+        if (orderItem.getMaterialCode() != null
+                && quoteItem.getMaterialCode() != null
+                && orderItem.getMaterialCode().equalsIgnoreCase(quoteItem.getMaterialCode())) {
+            score += 3;
+        }
+        if (orderItem.getMaterialGrams() != null
+                && quoteItem.getMaterialGrams() != null
+                && orderItem.getMaterialGrams().compareTo(quoteItem.getMaterialGrams()) == 0) {
+            score += 2;
+        }
+        return score;
+    }
+
+    private String normalizeFilename(String filename) {
+        if (filename == null || filename.isBlank()) {
+            return null;
+        }
+        return filename.trim();
+    }
+
+    private Path resolveStoredQuotePath(String storedPath, UUID expectedSessionId) {
+        if (storedPath == null || storedPath.isBlank()) {
+            return null;
+        }
+        try {
+            Path raw = Path.of(storedPath).normalize();
+            Path resolved = raw.isAbsolute() ? raw : QUOTE_STORAGE_ROOT.resolve(raw).normalize();
+            Path expectedSessionRoot = QUOTE_STORAGE_ROOT.resolve(expectedSessionId.toString()).normalize();
+            if (!resolved.startsWith(expectedSessionRoot)) {
+                return null;
+            }
+            return resolved;
+        } catch (InvalidPathException e) {
+            return null;
+        }
+    }
+
+    private Path buildConfirmationPdfRelativePath(UUID orderId, String orderNumber) {
+        return Path.of("orders", orderId.toString(), "documents", "confirmation-" + orderNumber + ".pdf");
+    }
+}

backend/src/main/java/com/printcalculator/service/order/OrderControllerService.java

@@ -0,0 +1,352 @@
+package com.printcalculator.service.order;
+
+import com.printcalculator.dto.AddressDto;
+import com.printcalculator.dto.CreateOrderRequest;
+import com.printcalculator.dto.OrderDto;
+import com.printcalculator.dto.OrderItemDto;
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.OrderItem;
+import com.printcalculator.entity.Payment;
+import com.printcalculator.repository.OrderItemRepository;
+import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.PaymentRepository;
+import com.printcalculator.service.OrderService;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.PaymentService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.payment.TwintPaymentService;
+import com.printcalculator.service.storage.StorageService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+@Service
+@Transactional(readOnly = true)
+public class OrderControllerService {
+    private static final Pattern SAFE_EXTENSION_PATTERN = Pattern.compile("^[a-z0-9]{1,10}$");
+    private static final Set<String> PERSONAL_DATA_REDACTED_STATUSES = Set.of(
+            "IN_PRODUCTION",
+            "SHIPPED",
+            "COMPLETED"
+    );
+
+    private final OrderService orderService;
+    private final OrderRepository orderRepo;
+    private final OrderItemRepository orderItemRepo;
+    private final StorageService storageService;
+    private final InvoicePdfRenderingService invoiceService;
+    private final QrBillService qrBillService;
+    private final TwintPaymentService twintPaymentService;
+    private final PaymentService paymentService;
+    private final PaymentRepository paymentRepo;
+
+    public OrderControllerService(OrderService orderService,
+                                  OrderRepository orderRepo,
+                                  OrderItemRepository orderItemRepo,
+                                  StorageService storageService,
+                                  InvoicePdfRenderingService invoiceService,
+                                  QrBillService qrBillService,
+                                  TwintPaymentService twintPaymentService,
+                                  PaymentService paymentService,
+                                  PaymentRepository paymentRepo) {
+        this.orderService = orderService;
+        this.orderRepo = orderRepo;
+        this.orderItemRepo = orderItemRepo;
+        this.storageService = storageService;
+        this.invoiceService = invoiceService;
+        this.qrBillService = qrBillService;
+        this.twintPaymentService = twintPaymentService;
+        this.paymentService = paymentService;
+        this.paymentRepo = paymentRepo;
+    }
+
+    @Transactional
+    public OrderDto createOrderFromQuote(UUID quoteSessionId, CreateOrderRequest request) {
+        Order order = orderService.createOrderFromQuote(quoteSessionId, request);
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+        return convertToDto(order, items);
+    }
+
+    @Transactional
+    public boolean uploadOrderItemFile(UUID orderId, UUID orderItemId, MultipartFile file) throws IOException {
+        OrderItem item = orderItemRepo.findById(orderItemId)
+                .orElseThrow(() -> new RuntimeException("OrderItem not found"));
+
+        if (!item.getOrder().getId().equals(orderId)) {
+            return false;
+        }
+
+        String relativePath = item.getStoredRelativePath();
+        Path destinationRelativePath;
+        if (relativePath == null || relativePath.equals("PENDING")) {
+            String ext = getExtension(file.getOriginalFilename());
+            String storedFilename = UUID.randomUUID() + "." + ext;
+            destinationRelativePath = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString(), storedFilename);
+            item.setStoredRelativePath(destinationRelativePath.toString());
+            item.setStoredFilename(storedFilename);
+        } else {
+            destinationRelativePath = resolveOrderItemRelativePath(relativePath, orderId, orderItemId);
+            if (destinationRelativePath == null) {
+                return false;
+            }
+        }
+
+        storageService.store(file, destinationRelativePath);
+        item.setFileSizeBytes(file.getSize());
+        item.setMimeType(file.getContentType());
+        orderItemRepo.save(item);
+
+        return true;
+    }
+
+    public Optional<OrderDto> getOrder(UUID orderId) {
+        return orderRepo.findById(orderId)
+                .map(order -> {
+                    List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+                    return convertToDto(order, items);
+                });
+    }
+
+    @Transactional
+    public Optional<OrderDto> reportPayment(UUID orderId, String method) {
+        paymentService.reportPayment(orderId, method);
+        return getOrder(orderId);
+    }
+
+    public ResponseEntity<byte[]> getConfirmation(UUID orderId) {
+        return generateDocument(orderId, true);
+    }
+
+    public ResponseEntity<Map<String, String>> getTwintPayment(UUID orderId) {
+        Order order = orderRepo.findById(orderId).orElse(null);
+        if (order == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        byte[] qrPng = twintPaymentService.generateQrPng(order, 360);
+        String qrDataUri = "data:image/png;base64," + Base64.getEncoder().encodeToString(qrPng);
+
+        Map<String, String> data = new HashMap<>();
+        data.put("paymentUrl", twintPaymentService.getTwintPaymentUrl(order));
+        data.put("openUrl", "/api/orders/" + orderId + "/twint/open");
+        data.put("qrImageUrl", "/api/orders/" + orderId + "/twint/qr");
+        data.put("qrImageDataUri", qrDataUri);
+        return ResponseEntity.ok(data);
+    }
+
+    public ResponseEntity<Void> openTwintPayment(UUID orderId) {
+        Order order = orderRepo.findById(orderId).orElse(null);
+        if (order == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.status(302)
+                .location(URI.create(twintPaymentService.getTwintPaymentUrl(order)))
+                .build();
+    }
+
+    public ResponseEntity<byte[]> getTwintQr(UUID orderId, int size) {
+        Order order = orderRepo.findById(orderId).orElse(null);
+        if (order == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        int normalizedSize = Math.max(200, Math.min(size, 600));
+        byte[] png = twintPaymentService.generateQrPng(order, normalizedSize);
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.IMAGE_PNG)
+                .body(png);
+    }
+
+    private ResponseEntity<byte[]> generateDocument(UUID orderId, boolean isConfirmation) {
+        Order order = orderRepo.findById(orderId)
+                .orElseThrow(() -> new RuntimeException("Order not found"));
+
+        if (isConfirmation) {
+            Path relativePath = buildConfirmationPdfRelativePath(order);
+            try {
+                byte[] existingPdf = storageService.loadAsResource(relativePath).getInputStream().readAllBytes();
+                return ResponseEntity.ok()
+                        .header("Content-Disposition", "attachment; filename=\"confirmation-" + getDisplayOrderNumber(order) + ".pdf\"")
+                        .contentType(MediaType.APPLICATION_PDF)
+                        .body(existingPdf);
+            } catch (Exception ignored) {
+                // Fallback to on-the-fly generation if the stored file is missing or unreadable.
+            }
+        }
+
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(orderId);
+        Payment payment = paymentRepo.findByOrder_Id(orderId).orElse(null);
+
+        byte[] pdf = invoiceService.generateDocumentPdf(order, items, isConfirmation, qrBillService, payment);
+        String typePrefix = isConfirmation ? "confirmation-" : "invoice-";
+        String truncatedUuid = order.getId().toString().substring(0, 8);
+        return ResponseEntity.ok()
+                .header("Content-Disposition", "attachment; filename=\"" + typePrefix + truncatedUuid + ".pdf\"")
+                .contentType(MediaType.APPLICATION_PDF)
+                .body(pdf);
+    }
+
+    private Path buildConfirmationPdfRelativePath(Order order) {
+        return Path.of(
+                "orders",
+                order.getId().toString(),
+                "documents",
+                "confirmation-" + getDisplayOrderNumber(order) + ".pdf"
+        );
+    }
+
+    private String getExtension(String filename) {
+        if (filename == null) {
+            return "stl";
+        }
+        String cleaned = StringUtils.cleanPath(filename);
+        if (cleaned.contains("..")) {
+            return "stl";
+        }
+        int i = cleaned.lastIndexOf('.');
+        if (i > 0 && i < cleaned.length() - 1) {
+            String ext = cleaned.substring(i + 1).toLowerCase(Locale.ROOT);
+            if (SAFE_EXTENSION_PATTERN.matcher(ext).matches()) {
+                return ext;
+            }
+        }
+        return "stl";
+    }
+
+    private Path resolveOrderItemRelativePath(String storedRelativePath, UUID orderId, UUID orderItemId) {
+        try {
+            Path candidate = Path.of(storedRelativePath).normalize();
+            if (candidate.isAbsolute()) {
+                return null;
+            }
+
+            Path expectedPrefix = Path.of("orders", orderId.toString(), "3d-files", orderItemId.toString());
+            if (!candidate.startsWith(expectedPrefix)) {
+                return null;
+            }
+
+            return candidate;
+        } catch (InvalidPathException e) {
+            return null;
+        }
+    }
+
+    private OrderDto convertToDto(Order order, List<OrderItem> items) {
+        OrderDto dto = new OrderDto();
+        dto.setId(order.getId());
+        dto.setOrderNumber(getDisplayOrderNumber(order));
+        dto.setStatus(order.getStatus());
+
+        paymentRepo.findByOrder_Id(order.getId()).ifPresent(payment -> {
+            dto.setPaymentStatus(payment.getStatus());
+            dto.setPaymentMethod(payment.getMethod());
+        });
+
+        boolean redactPersonalData = shouldRedactPersonalData(order.getStatus());
+        if (!redactPersonalData) {
+            dto.setCustomerEmail(order.getCustomerEmail());
+            dto.setCustomerPhone(order.getCustomerPhone());
+            dto.setBillingCustomerType(order.getBillingCustomerType());
+        }
+        dto.setPreferredLanguage(order.getPreferredLanguage());
+        dto.setCurrency(order.getCurrency());
+        dto.setSetupCostChf(order.getSetupCostChf());
+        dto.setShippingCostChf(order.getShippingCostChf());
+        dto.setDiscountChf(order.getDiscountChf());
+        dto.setSubtotalChf(order.getSubtotalChf());
+        dto.setIsCadOrder(order.getIsCadOrder());
+        dto.setSourceRequestId(order.getSourceRequestId());
+        dto.setCadHours(order.getCadHours());
+        dto.setCadHourlyRateChf(order.getCadHourlyRateChf());
+        dto.setCadTotalChf(order.getCadTotalChf());
+        dto.setTotalChf(order.getTotalChf());
+        dto.setCreatedAt(order.getCreatedAt());
+        dto.setShippingSameAsBilling(order.getShippingSameAsBilling());
+
+        if (!redactPersonalData) {
+            AddressDto billing = new AddressDto();
+            billing.setFirstName(order.getBillingFirstName());
+            billing.setLastName(order.getBillingLastName());
+            billing.setCompanyName(order.getBillingCompanyName());
+            billing.setContactPerson(order.getBillingContactPerson());
+            billing.setAddressLine1(order.getBillingAddressLine1());
+            billing.setAddressLine2(order.getBillingAddressLine2());
+            billing.setZip(order.getBillingZip());
+            billing.setCity(order.getBillingCity());
+            billing.setCountryCode(order.getBillingCountryCode());
+            dto.setBillingAddress(billing);
+
+            if (!Boolean.TRUE.equals(order.getShippingSameAsBilling())) {
+                AddressDto shipping = new AddressDto();
+                shipping.setFirstName(order.getShippingFirstName());
+                shipping.setLastName(order.getShippingLastName());
+                shipping.setCompanyName(order.getShippingCompanyName());
+                shipping.setContactPerson(order.getShippingContactPerson());
+                shipping.setAddressLine1(order.getShippingAddressLine1());
+                shipping.setAddressLine2(order.getShippingAddressLine2());
+                shipping.setZip(order.getShippingZip());
+                shipping.setCity(order.getShippingCity());
+                shipping.setCountryCode(order.getShippingCountryCode());
+                dto.setShippingAddress(shipping);
+            }
+        }
+
+        List<OrderItemDto> itemDtos = items.stream().map(item -> {
+            OrderItemDto itemDto = new OrderItemDto();
+            itemDto.setId(item.getId());
+            itemDto.setOriginalFilename(item.getOriginalFilename());
+            itemDto.setMaterialCode(item.getMaterialCode());
+            itemDto.setColorCode(item.getColorCode());
+            itemDto.setQuality(item.getQuality());
+            itemDto.setNozzleDiameterMm(item.getNozzleDiameterMm());
+            itemDto.setLayerHeightMm(item.getLayerHeightMm());
+            itemDto.setInfillPercent(item.getInfillPercent());
+            itemDto.setInfillPattern(item.getInfillPattern());
+            itemDto.setSupportsEnabled(item.getSupportsEnabled());
+            itemDto.setQuantity(item.getQuantity());
+            itemDto.setPrintTimeSeconds(item.getPrintTimeSeconds());
+            itemDto.setMaterialGrams(item.getMaterialGrams());
+            itemDto.setUnitPriceChf(item.getUnitPriceChf());
+            itemDto.setLineTotalChf(item.getLineTotalChf());
+            return itemDto;
+        }).collect(Collectors.toList());
+        dto.setItems(itemDtos);
+
+        return dto;
+    }
+
+    private boolean shouldRedactPersonalData(String status) {
+        if (status == null || status.isBlank()) {
+            return false;
+        }
+        return PERSONAL_DATA_REDACTED_STATUSES.contains(status.trim().toUpperCase(Locale.ROOT));
+    }
+
+    private String getDisplayOrderNumber(Order order) {
+        String orderNumber = order.getOrderNumber();
+        if (orderNumber != null && !orderNumber.isBlank()) {
+            return orderNumber;
+        }
+        return order.getId() != null ? order.getId().toString() : "unknown";
+    }
+}

backend/src/main/java/com/printcalculator/service/payment/InvoicePdfRenderingService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.payment;
 
 import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
 import com.openhtmltopdf.svgsupport.BatikSVGDrawer;
@@ -14,6 +14,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import com.printcalculator.entity.Order;
 import com.printcalculator.entity.OrderItem;
@@ -95,6 +97,17 @@ public class InvoicePdfRenderingService {
             return line;
         }).collect(Collectors.toList());
 
+        if (order.getCadTotalChf() != null && order.getCadTotalChf().compareTo(BigDecimal.ZERO) > 0) {
+            BigDecimal cadHours = order.getCadHours() != null ? order.getCadHours() : BigDecimal.ZERO;
+            BigDecimal cadHourlyRate = order.getCadHourlyRateChf() != null ? order.getCadHourlyRateChf() : BigDecimal.ZERO;
+            Map<String, Object> cadLine = new HashMap<>();
+            cadLine.put("description", "Servizio CAD (" + formatCadHours(cadHours) + "h)");
+            cadLine.put("quantity", 1);
+            cadLine.put("unitPriceFormatted", String.format("CHF %.2f", cadHourlyRate));
+            cadLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getCadTotalChf()));
+            invoiceLineItems.add(cadLine);
+        }
+
         Map<String, Object> setupLine = new HashMap<>();
         setupLine.put("description", "Costo Setup");
         setupLine.put("quantity", 1);
@@ -140,4 +153,8 @@ public class InvoicePdfRenderingService {
         
         return generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
     }
+
+    private String formatCadHours(BigDecimal hours) {
+        return hours.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
+    }
 }

backend/src/main/java/com/printcalculator/service/payment/PaymentService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.payment;
 
 import com.printcalculator.entity.Order;
 import com.printcalculator.entity.Payment;
@@ -65,7 +65,7 @@ public class PaymentService {
         payment.setReportedAt(OffsetDateTime.now());
         
         // We intentionally do not update the payment method here based on user input,
-        // because the user cannot reliably determine the actual method without an integration.
+        // because the system cannot reliably determine the actual method without an integration.
         // It will be updated by the backoffice admin manually.
 
         payment = paymentRepo.save(payment);
@@ -98,4 +98,20 @@ public class PaymentService {
 
         return payment;
     }
+
+    @Transactional
+    public Payment updatePaymentMethod(UUID orderId, String method) {
+        if (method == null || method.isBlank()) {
+            throw new IllegalArgumentException("Payment method is required");
+        }
+
+        Order order = orderRepo.findById(orderId)
+                .orElseThrow(() -> new RuntimeException("Order not found with id " + orderId));
+
+        Payment payment = paymentRepo.findByOrder_Id(orderId)
+                .orElseGet(() -> getOrCreatePaymentForOrder(order, "OTHER"));
+
+        payment.setMethod(method.trim().toUpperCase());
+        return paymentRepo.save(payment);
+    }
 }

backend/src/main/java/com/printcalculator/service/payment/QrBillService.java

@@ -1,13 +1,10 @@
-package com.printcalculator.service;
+package com.printcalculator.service.payment;
 
 import com.printcalculator.entity.Order;
 import net.codecrete.qrbill.generator.Bill;
-import net.codecrete.qrbill.generator.GraphicsFormat;
 import net.codecrete.qrbill.generator.QRBill;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 @Service
 public class QrBillService {
 

backend/src/main/java/com/printcalculator/service/payment/TwintPaymentService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.payment;
 
 import io.nayuki.qrcodegen.QrCode;
 import org.springframework.beans.factory.annotation.Value;

backend/src/main/java/com/printcalculator/service/quote/QuoteSessionItemService.java

@@ -0,0 +1,251 @@
+package com.printcalculator.service.quote;
+
+import com.printcalculator.dto.PrintSettingsDto;
+import com.printcalculator.entity.FilamentVariant;
+import com.printcalculator.entity.PrinterMachine;
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.model.ModelDimensions;
+import com.printcalculator.model.PrintStats;
+import com.printcalculator.model.QuoteResult;
+import com.printcalculator.repository.QuoteLineItemRepository;
+import com.printcalculator.repository.QuoteSessionRepository;
+import com.printcalculator.service.OrcaProfileResolver;
+import com.printcalculator.service.QuoteCalculator;
+import com.printcalculator.service.SlicerService;
+import com.printcalculator.service.storage.ClamAVService;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
+@Service
+public class QuoteSessionItemService {
+    private final QuoteLineItemRepository lineItemRepo;
+    private final QuoteSessionRepository sessionRepo;
+    private final SlicerService slicerService;
+    private final QuoteCalculator quoteCalculator;
+    private final OrcaProfileResolver orcaProfileResolver;
+    private final ClamAVService clamAVService;
+    private final QuoteStorageService quoteStorageService;
+    private final QuoteSessionSettingsService settingsService;
+
+    public QuoteSessionItemService(QuoteLineItemRepository lineItemRepo,
+                                   QuoteSessionRepository sessionRepo,
+                                   SlicerService slicerService,
+                                   QuoteCalculator quoteCalculator,
+                                   OrcaProfileResolver orcaProfileResolver,
+                                   ClamAVService clamAVService,
+                                   QuoteStorageService quoteStorageService,
+                                   QuoteSessionSettingsService settingsService) {
+        this.lineItemRepo = lineItemRepo;
+        this.sessionRepo = sessionRepo;
+        this.slicerService = slicerService;
+        this.quoteCalculator = quoteCalculator;
+        this.orcaProfileResolver = orcaProfileResolver;
+        this.clamAVService = clamAVService;
+        this.quoteStorageService = quoteStorageService;
+        this.settingsService = settingsService;
+    }
+
+    public QuoteLineItem addItemToSession(QuoteSession session, MultipartFile file, PrintSettingsDto settings) throws IOException {
+        if (file.isEmpty()) {
+            throw new IllegalArgumentException("File is empty");
+        }
+        if ("CONVERTED".equals(session.getStatus())) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Cannot modify a converted session");
+        }
+
+        clamAVService.scan(file.getInputStream());
+
+        Path sessionStorageDir = quoteStorageService.sessionStorageDir(session.getId());
+        String ext = quoteStorageService.getSafeExtension(file.getOriginalFilename(), "stl");
+        String storedFilename = UUID.randomUUID() + "." + ext;
+        Path persistentPath = quoteStorageService.resolveSessionPath(sessionStorageDir, storedFilename);
+
+        try (InputStream inputStream = file.getInputStream()) {
+            Files.copy(inputStream, persistentPath, StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        Path convertedPersistentPath = null;
+        try {
+            boolean cadSession = "CAD_ACTIVE".equals(session.getStatus());
+
+            if (cadSession) {
+                settingsService.enforceCadPrintSettings(session, settings);
+            } else {
+                settingsService.applyPrintSettings(settings);
+            }
+
+            QuoteSessionSettingsService.NozzleLayerSettings nozzleAndLayer = settingsService.resolveNozzleAndLayer(settings);
+            BigDecimal nozzleDiameter = nozzleAndLayer.nozzleDiameter();
+            BigDecimal layerHeight = nozzleAndLayer.layerHeight();
+
+            PrinterMachine machine = settingsService.resolvePrinterMachine(settings.getPrinterMachineId());
+            FilamentVariant selectedVariant = settingsService.resolveFilamentVariant(settings);
+
+            validateCadMaterialLock(session, cadSession, selectedVariant);
+
+            if (!cadSession) {
+                session.setMaterialCode(selectedVariant.getFilamentMaterialType().getMaterialCode());
+                session.setNozzleDiameterMm(nozzleDiameter);
+                session.setLayerHeightMm(layerHeight);
+                session.setInfillPattern(settings.getInfillPattern());
+                session.setInfillPercent(settings.getInfillDensity() != null ? settings.getInfillDensity().intValue() : 20);
+                session.setSupportsEnabled(settings.getSupportsEnabled() != null ? settings.getSupportsEnabled() : false);
+                sessionRepo.save(session);
+            }
+
+            OrcaProfileResolver.ResolvedProfiles profiles = orcaProfileResolver.resolve(machine, nozzleDiameter, selectedVariant);
+            String processProfile = resolveProcessProfile(settings);
+
+            Map<String, String> processOverrides = new HashMap<>();
+            processOverrides.put("layer_height", layerHeight.stripTrailingZeros().toPlainString());
+            if (settings.getInfillDensity() != null) {
+                processOverrides.put("sparse_infill_density", settings.getInfillDensity() + "%");
+            }
+            if (settings.getInfillPattern() != null) {
+                processOverrides.put("sparse_infill_pattern", settings.getInfillPattern());
+            }
+
+            Path slicerInputPath = persistentPath;
+            if ("3mf".equals(ext)) {
+                String convertedFilename = UUID.randomUUID() + "-converted.stl";
+                convertedPersistentPath = quoteStorageService.resolveSessionPath(sessionStorageDir, convertedFilename);
+                slicerService.convert3mfToPersistentStl(persistentPath.toFile(), convertedPersistentPath);
+                slicerInputPath = convertedPersistentPath;
+            }
+
+            PrintStats stats = slicerService.slice(
+                    slicerInputPath.toFile(),
+                    profiles.machineProfileName(),
+                    profiles.filamentProfileName(),
+                    processProfile,
+                    null,
+                    processOverrides
+            );
+
+            Optional<ModelDimensions> modelDimensions = slicerService.inspectModelDimensions(slicerInputPath.toFile());
+            QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), selectedVariant);
+
+            QuoteLineItem item = buildLineItem(
+                    session,
+                    file.getOriginalFilename(),
+                    settings,
+                    selectedVariant,
+                    nozzleDiameter,
+                    layerHeight,
+                    stats,
+                    result,
+                    modelDimensions,
+                    persistentPath,
+                    convertedPersistentPath
+            );
+
+            return lineItemRepo.save(item);
+        } catch (Exception e) {
+            Files.deleteIfExists(persistentPath);
+            if (convertedPersistentPath != null) {
+                Files.deleteIfExists(convertedPersistentPath);
+            }
+            throw e;
+        }
+    }
+
+    private void validateCadMaterialLock(QuoteSession session, boolean cadSession, FilamentVariant selectedVariant) {
+        if (!cadSession
+                || session.getMaterialCode() == null
+                || selectedVariant.getFilamentMaterialType() == null
+                || selectedVariant.getFilamentMaterialType().getMaterialCode() == null) {
+            return;
+        }
+        String lockedMaterial = settingsService.normalizeRequestedMaterialCode(session.getMaterialCode());
+        String selectedMaterial = settingsService.normalizeRequestedMaterialCode(
+                selectedVariant.getFilamentMaterialType().getMaterialCode()
+        );
+        if (!lockedMaterial.equals(selectedMaterial)) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Selected filament does not match locked CAD material");
+        }
+    }
+
+    private String resolveProcessProfile(PrintSettingsDto settings) {
+        if (settings.getLayerHeight() == null) {
+            return "standard";
+        }
+        if (settings.getLayerHeight() >= 0.28) {
+            return "draft";
+        }
+        if (settings.getLayerHeight() <= 0.12) {
+            return "extra_fine";
+        }
+        return "standard";
+    }
+
+    private QuoteLineItem buildLineItem(QuoteSession session,
+                                        String originalFilename,
+                                        PrintSettingsDto settings,
+                                        FilamentVariant selectedVariant,
+                                        BigDecimal nozzleDiameter,
+                                        BigDecimal layerHeight,
+                                        PrintStats stats,
+                                        QuoteResult result,
+                                        Optional<ModelDimensions> modelDimensions,
+                                        Path persistentPath,
+                                        Path convertedPersistentPath) {
+        QuoteLineItem item = new QuoteLineItem();
+        item.setQuoteSession(session);
+        item.setOriginalFilename(originalFilename);
+        item.setStoredPath(quoteStorageService.toStoredPath(persistentPath));
+        item.setQuantity(1);
+        item.setColorCode(selectedVariant.getColorName());
+        item.setFilamentVariant(selectedVariant);
+        item.setMaterialCode(selectedVariant.getFilamentMaterialType() != null
+                ? selectedVariant.getFilamentMaterialType().getMaterialCode()
+                : settingsService.normalizeRequestedMaterialCode(settings.getMaterial()));
+        item.setQuality(settingsService.resolveQuality(settings, layerHeight));
+        item.setNozzleDiameterMm(nozzleDiameter);
+        item.setLayerHeightMm(layerHeight);
+        item.setInfillPercent(settings.getInfillDensity() != null ? settings.getInfillDensity().intValue() : 20);
+        item.setInfillPattern(settings.getInfillPattern());
+        item.setSupportsEnabled(settings.getSupportsEnabled() != null ? settings.getSupportsEnabled() : false);
+        item.setStatus("READY");
+
+        item.setPrintTimeSeconds((int) stats.printTimeSeconds());
+        item.setMaterialGrams(BigDecimal.valueOf(stats.filamentWeightGrams()));
+        item.setUnitPriceChf(BigDecimal.valueOf(result.getTotalPrice()));
+
+        Map<String, Object> breakdown = new HashMap<>();
+        breakdown.put("machine_cost", result.getTotalPrice());
+        breakdown.put("setup_fee", 0);
+        if (convertedPersistentPath != null) {
+            breakdown.put("convertedStoredPath", quoteStorageService.toStoredPath(convertedPersistentPath));
+        }
+        item.setPricingBreakdown(breakdown);
+
+        item.setBoundingBoxXMm(modelDimensions
+                .map(dim -> BigDecimal.valueOf(dim.xMm()))
+                .orElseGet(() -> settings.getBoundingBoxX() != null ? BigDecimal.valueOf(settings.getBoundingBoxX()) : BigDecimal.ZERO));
+        item.setBoundingBoxYMm(modelDimensions
+                .map(dim -> BigDecimal.valueOf(dim.yMm()))
+                .orElseGet(() -> settings.getBoundingBoxY() != null ? BigDecimal.valueOf(settings.getBoundingBoxY()) : BigDecimal.ZERO));
+        item.setBoundingBoxZMm(modelDimensions
+                .map(dim -> BigDecimal.valueOf(dim.zMm()))
+                .orElseGet(() -> settings.getBoundingBoxZ() != null ? BigDecimal.valueOf(settings.getBoundingBoxZ()) : BigDecimal.ZERO));
+
+        item.setCreatedAt(OffsetDateTime.now());
+        item.setUpdatedAt(OffsetDateTime.now());
+        return item;
+    }
+}

backend/src/main/java/com/printcalculator/service/quote/QuoteSessionResponseAssembler.java

@@ -0,0 +1,77 @@
+package com.printcalculator.service.quote;
+
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.service.QuoteSessionTotalsService;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class QuoteSessionResponseAssembler {
+    private final QuoteStorageService quoteStorageService;
+
+    public QuoteSessionResponseAssembler(QuoteStorageService quoteStorageService) {
+        this.quoteStorageService = quoteStorageService;
+    }
+
+    public Map<String, Object> assemble(QuoteSession session,
+                                        List<QuoteLineItem> items,
+                                        QuoteSessionTotalsService.QuoteSessionTotals totals) {
+        List<Map<String, Object>> itemsDto = new ArrayList<>();
+        for (QuoteLineItem item : items) {
+            itemsDto.add(toItemDto(item, totals));
+        }
+
+        Map<String, Object> response = new HashMap<>();
+        response.put("session", session);
+        response.put("items", itemsDto);
+        response.put("printItemsTotalChf", totals.printItemsTotalChf());
+        response.put("cadTotalChf", totals.cadTotalChf());
+        response.put("itemsTotalChf", totals.itemsTotalChf());
+        response.put("shippingCostChf", totals.shippingCostChf());
+        response.put("globalMachineCostChf", totals.globalMachineCostChf());
+        response.put("grandTotalChf", totals.grandTotalChf());
+        return response;
+    }
+
+    private Map<String, Object> toItemDto(QuoteLineItem item, QuoteSessionTotalsService.QuoteSessionTotals totals) {
+        Map<String, Object> dto = new HashMap<>();
+        dto.put("id", item.getId());
+        dto.put("originalFilename", item.getOriginalFilename());
+        dto.put("quantity", item.getQuantity());
+        dto.put("printTimeSeconds", item.getPrintTimeSeconds());
+        dto.put("materialGrams", item.getMaterialGrams());
+        dto.put("colorCode", item.getColorCode());
+        dto.put("filamentVariantId", item.getFilamentVariant() != null ? item.getFilamentVariant().getId() : null);
+        dto.put("materialCode", item.getMaterialCode());
+        dto.put("quality", item.getQuality());
+        dto.put("nozzleDiameterMm", item.getNozzleDiameterMm());
+        dto.put("layerHeightMm", item.getLayerHeightMm());
+        dto.put("infillPercent", item.getInfillPercent());
+        dto.put("infillPattern", item.getInfillPattern());
+        dto.put("supportsEnabled", item.getSupportsEnabled());
+        dto.put("status", item.getStatus());
+        dto.put("convertedStoredPath", quoteStorageService.extractConvertedStoredPath(item));
+        dto.put("unitPriceChf", resolveDistributedUnitPrice(item, totals));
+        return dto;
+    }
+
+    private BigDecimal resolveDistributedUnitPrice(QuoteLineItem item, QuoteSessionTotalsService.QuoteSessionTotals totals) {
+        BigDecimal unitPrice = item.getUnitPriceChf() != null ? item.getUnitPriceChf() : BigDecimal.ZERO;
+        int quantity = item.getQuantity() != null && item.getQuantity() > 0 ? item.getQuantity() : 1;
+        if (totals.totalPrintSeconds().compareTo(BigDecimal.ZERO) > 0 && item.getPrintTimeSeconds() != null) {
+            BigDecimal itemSeconds = BigDecimal.valueOf(item.getPrintTimeSeconds()).multiply(BigDecimal.valueOf(quantity));
+            BigDecimal share = itemSeconds.divide(totals.totalPrintSeconds(), 8, RoundingMode.HALF_UP);
+            BigDecimal itemMachineCost = totals.globalMachineCostChf().multiply(share);
+            BigDecimal unitMachineCost = itemMachineCost.divide(BigDecimal.valueOf(quantity), 2, RoundingMode.HALF_UP);
+            unitPrice = unitPrice.add(unitMachineCost);
+        }
+        return unitPrice;
+    }
+}

backend/src/main/java/com/printcalculator/service/quote/QuoteSessionSettingsService.java

@@ -0,0 +1,179 @@
+package com.printcalculator.service.quote;
+
+import com.printcalculator.dto.PrintSettingsDto;
+import com.printcalculator.entity.FilamentMaterialType;
+import com.printcalculator.entity.FilamentVariant;
+import com.printcalculator.entity.PrinterMachine;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.repository.FilamentMaterialTypeRepository;
+import com.printcalculator.repository.FilamentVariantRepository;
+import com.printcalculator.repository.PrinterMachineRepository;
+import com.printcalculator.service.NozzleLayerHeightPolicyService;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.math.BigDecimal;
+import java.util.Locale;
+import java.util.Optional;
+
+@Service
+public class QuoteSessionSettingsService {
+    private final PrinterMachineRepository machineRepo;
+    private final FilamentMaterialTypeRepository materialRepo;
+    private final FilamentVariantRepository variantRepo;
+    private final NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService;
+
+    public QuoteSessionSettingsService(PrinterMachineRepository machineRepo,
+                                       FilamentMaterialTypeRepository materialRepo,
+                                       FilamentVariantRepository variantRepo,
+                                       NozzleLayerHeightPolicyService nozzleLayerHeightPolicyService) {
+        this.machineRepo = machineRepo;
+        this.materialRepo = materialRepo;
+        this.variantRepo = variantRepo;
+        this.nozzleLayerHeightPolicyService = nozzleLayerHeightPolicyService;
+    }
+
+    public void applyPrintSettings(PrintSettingsDto settings) {
+        if (settings.getNozzleDiameter() == null) {
+            settings.setNozzleDiameter(0.40);
+        }
+
+        if ("BASIC".equalsIgnoreCase(settings.getComplexityMode())) {
+            String quality = settings.getQuality() != null ? settings.getQuality().toLowerCase() : "standard";
+
+            switch (quality) {
+                case "draft" -> {
+                    settings.setLayerHeight(0.28);
+                    settings.setInfillDensity(15.0);
+                    settings.setInfillPattern("grid");
+                }
+                case "extra_fine", "high_definition", "high" -> {
+                    settings.setLayerHeight(0.12);
+                    settings.setInfillDensity(20.0);
+                    settings.setInfillPattern("gyroid");
+                }
+                case "standard" -> {
+                    settings.setLayerHeight(0.20);
+                    settings.setInfillDensity(15.0);
+                    settings.setInfillPattern("grid");
+                }
+                default -> {
+                    settings.setLayerHeight(0.20);
+                    settings.setInfillDensity(15.0);
+                    settings.setInfillPattern("grid");
+                }
+            }
+        } else {
+            if (settings.getInfillDensity() == null) {
+                settings.setInfillDensity(20.0);
+            }
+            if (settings.getInfillPattern() == null) {
+                settings.setInfillPattern("grid");
+            }
+        }
+    }
+
+    public void enforceCadPrintSettings(QuoteSession session, PrintSettingsDto settings) {
+        settings.setComplexityMode("ADVANCED");
+        settings.setMaterial(session.getMaterialCode() != null ? session.getMaterialCode() : "PLA");
+        settings.setNozzleDiameter(session.getNozzleDiameterMm() != null ? session.getNozzleDiameterMm().doubleValue() : 0.4);
+        settings.setLayerHeight(session.getLayerHeightMm() != null ? session.getLayerHeightMm().doubleValue() : 0.2);
+        settings.setInfillPattern(session.getInfillPattern() != null ? session.getInfillPattern() : "grid");
+        settings.setInfillDensity(session.getInfillPercent() != null ? session.getInfillPercent().doubleValue() : 20.0);
+        settings.setSupportsEnabled(Boolean.TRUE.equals(session.getSupportsEnabled()));
+    }
+
+    public NozzleLayerSettings resolveNozzleAndLayer(PrintSettingsDto settings) {
+        BigDecimal nozzleDiameter = nozzleLayerHeightPolicyService.resolveNozzle(
+                settings.getNozzleDiameter() != null ? BigDecimal.valueOf(settings.getNozzleDiameter()) : null
+        );
+        BigDecimal layerHeight = nozzleLayerHeightPolicyService.resolveLayer(
+                settings.getLayerHeight() != null ? BigDecimal.valueOf(settings.getLayerHeight()) : null,
+                nozzleDiameter
+        );
+        if (!nozzleLayerHeightPolicyService.isAllowed(nozzleDiameter, layerHeight)) {
+            throw new ResponseStatusException(
+                    HttpStatus.BAD_REQUEST,
+                    "Layer height " + layerHeight.stripTrailingZeros().toPlainString()
+                            + " is not allowed for nozzle " + nozzleDiameter.stripTrailingZeros().toPlainString()
+                            + ". Allowed: " + nozzleLayerHeightPolicyService.allowedLayersLabel(nozzleDiameter)
+            );
+        }
+        settings.setNozzleDiameter(nozzleDiameter.doubleValue());
+        settings.setLayerHeight(layerHeight.doubleValue());
+        return new NozzleLayerSettings(nozzleDiameter, layerHeight);
+    }
+
+    public PrinterMachine resolvePrinterMachine(Long printerMachineId) {
+        if (printerMachineId != null) {
+            PrinterMachine selected = machineRepo.findById(printerMachineId)
+                    .orElseThrow(() -> new RuntimeException("Printer machine not found: " + printerMachineId));
+            if (!Boolean.TRUE.equals(selected.getIsActive())) {
+                throw new RuntimeException("Selected printer machine is not active");
+            }
+            return selected;
+        }
+
+        return machineRepo.findFirstByIsActiveTrue()
+                .orElseThrow(() -> new RuntimeException("No active printer found"));
+    }
+
+    public FilamentVariant resolveFilamentVariant(PrintSettingsDto settings) {
+        if (settings.getFilamentVariantId() != null) {
+            FilamentVariant variant = variantRepo.findById(settings.getFilamentVariantId())
+                    .orElseThrow(() -> new RuntimeException("Filament variant not found: " + settings.getFilamentVariantId()));
+            if (!Boolean.TRUE.equals(variant.getIsActive())) {
+                throw new RuntimeException("Selected filament variant is not active");
+            }
+            return variant;
+        }
+
+        String requestedMaterialCode = normalizeRequestedMaterialCode(settings.getMaterial());
+        FilamentMaterialType materialType = materialRepo.findByMaterialCode(requestedMaterialCode)
+                .orElseGet(() -> materialRepo.findByMaterialCode("PLA")
+                        .orElseThrow(() -> new RuntimeException("Fallback material PLA not configured")));
+
+        String requestedColor = settings.getColor() != null ? settings.getColor().trim() : null;
+        if (requestedColor != null && !requestedColor.isBlank()) {
+            Optional<FilamentVariant> byColor = variantRepo.findByFilamentMaterialTypeAndColorName(materialType, requestedColor);
+            if (byColor.isPresent() && Boolean.TRUE.equals(byColor.get().getIsActive())) {
+                return byColor.get();
+            }
+        }
+
+        return variantRepo.findFirstByFilamentMaterialTypeAndIsActiveTrue(materialType)
+                .orElseThrow(() -> new RuntimeException("No active variant for material: " + requestedMaterialCode));
+    }
+
+    public String normalizeRequestedMaterialCode(String value) {
+        if (value == null || value.isBlank()) {
+            return "PLA";
+        }
+
+        return value.trim()
+                .toUpperCase(Locale.ROOT)
+                .replace('_', ' ')
+                .replace('-', ' ')
+                .replaceAll("\\s+", " ");
+    }
+
+    public String resolveQuality(PrintSettingsDto settings, BigDecimal layerHeight) {
+        if (settings.getQuality() != null && !settings.getQuality().isBlank()) {
+            return settings.getQuality().trim().toLowerCase(Locale.ROOT);
+        }
+        if (layerHeight == null) {
+            return "standard";
+        }
+        if (layerHeight.compareTo(BigDecimal.valueOf(0.24)) >= 0) {
+            return "draft";
+        }
+        if (layerHeight.compareTo(BigDecimal.valueOf(0.12)) <= 0) {
+            return "extra_fine";
+        }
+        return "standard";
+    }
+
+    public record NozzleLayerSettings(BigDecimal nozzleDiameter, BigDecimal layerHeight) {
+    }
+}

backend/src/main/java/com/printcalculator/service/quote/QuoteStorageService.java

@@ -0,0 +1,91 @@
+package com.printcalculator.service.quote;
+
+import com.printcalculator.entity.QuoteLineItem;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class QuoteStorageService {
+    private static final Path QUOTE_STORAGE_ROOT = Paths.get("storage_quotes").toAbsolutePath().normalize();
+
+    public Path sessionStorageDir(UUID sessionId) throws IOException {
+        Path sessionStorageDir = QUOTE_STORAGE_ROOT.resolve(sessionId.toString()).normalize();
+        if (!sessionStorageDir.startsWith(QUOTE_STORAGE_ROOT)) {
+            throw new IOException("Invalid quote session storage path");
+        }
+        Files.createDirectories(sessionStorageDir);
+        return sessionStorageDir;
+    }
+
+    public Path resolveSessionPath(Path sessionStorageDir, String filename) throws IOException {
+        Path resolved = sessionStorageDir.resolve(filename).normalize();
+        if (!resolved.startsWith(sessionStorageDir)) {
+            throw new IOException("Invalid quote line-item storage path");
+        }
+        return resolved;
+    }
+
+    public String toStoredPath(Path absolutePath) {
+        return QUOTE_STORAGE_ROOT.relativize(absolutePath).toString();
+    }
+
+    public String getSafeExtension(String filename, String fallback) {
+        if (filename == null) {
+            return fallback;
+        }
+        String cleaned = StringUtils.cleanPath(filename);
+        if (cleaned.contains("..")) {
+            return fallback;
+        }
+        int index = cleaned.lastIndexOf('.');
+        if (index <= 0 || index >= cleaned.length() - 1) {
+            return fallback;
+        }
+        String ext = cleaned.substring(index + 1).toLowerCase(Locale.ROOT);
+        return switch (ext) {
+            case "stl" -> "stl";
+            case "3mf" -> "3mf";
+            case "step", "stp" -> "step";
+            default -> fallback;
+        };
+    }
+
+    public Path resolveStoredQuotePath(String storedPath, UUID expectedSessionId) {
+        if (storedPath == null || storedPath.isBlank()) {
+            return null;
+        }
+        try {
+            Path raw = Path.of(storedPath).normalize();
+            Path resolved = raw.isAbsolute() ? raw : QUOTE_STORAGE_ROOT.resolve(raw).normalize();
+            Path expectedSessionRoot = QUOTE_STORAGE_ROOT.resolve(expectedSessionId.toString()).normalize();
+            if (!resolved.startsWith(expectedSessionRoot)) {
+                return null;
+            }
+            return resolved;
+        } catch (InvalidPathException e) {
+            return null;
+        }
+    }
+
+    public String extractConvertedStoredPath(QuoteLineItem item) {
+        Map<String, Object> breakdown = item.getPricingBreakdown();
+        if (breakdown == null) {
+            return null;
+        }
+        Object converted = breakdown.get("convertedStoredPath");
+        if (converted == null) {
+            return null;
+        }
+        String path = String.valueOf(converted).trim();
+        return path.isEmpty() ? null : path;
+    }
+}

backend/src/main/java/com/printcalculator/service/storage/ClamAVService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.storage;
 
 import com.printcalculator.exception.VirusDetectedException;
 import org.slf4j.Logger;

backend/src/main/java/com/printcalculator/service/storage/FileSystemStorageService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.storage;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -7,7 +7,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.printcalculator.exception.StorageException;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;

backend/src/main/java/com/printcalculator/service/storage/StorageService.java

@@ -1,4 +1,4 @@
-package com.printcalculator.service;
+package com.printcalculator.service.storage;
 
 import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;

backend/src/main/resources/application.properties

@@ -4,7 +4,7 @@ server.port=8000
 # Database Configuration
 spring.datasource.url=${DB_URL:jdbc:postgresql://localhost:5432/printcalc}
 spring.datasource.username=${DB_USERNAME:printcalc}
-spring.datasource.password=${DB_PASSWORD:}
+spring.datasource.password=${DB_PASSWORD:printcalc_secret}
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.open-in-view=false
@@ -13,6 +13,7 @@ spring.jpa.open-in-view=false
 # Slicer Configuration
 # Map SLICER_PATH env var if present (default to /opt/orcaslicer/AppRun or Mac path)
 slicer.path=${SLICER_PATH:/Applications/OrcaSlicer.app/Contents/MacOS/OrcaSlicer}
+assimp.path=${ASSIMP_PATH:assimp}
 profiles.root=${PROFILES_DIR:profiles}
 
 
@@ -26,7 +27,7 @@ clamav.port=${CLAMAV_PORT:3310}
 clamav.enabled=${CLAMAV_ENABLED:false}
 
 # TWINT Configuration
-payment.twint.url=${TWINT_PAYMENT_URL:}
+payment.twint.url=${TWINT_PAYMENT_URL:https://go.twint.ch/1/e/tw?tw=acq.gERQQytOTnyIMuQHUqn4hlxgciHE5X7nnqHnNSPAr2OF2K3uBlXJDr2n9JU3sgxa.}
 
 # Mail Configuration
 spring.mail.host=${MAIL_HOST:mail.infomaniak.com}
@@ -42,7 +43,8 @@ app.mail.from=${APP_MAIL_FROM:${MAIL_USERNAME:noreply@printcalculator.local}}
 app.mail.admin.enabled=${APP_MAIL_ADMIN_ENABLED:true}
 app.mail.admin.address=${APP_MAIL_ADMIN_ADDRESS:admin@printcalculator.local}
 app.mail.contact-request.admin.enabled=${APP_MAIL_CONTACT_REQUEST_ADMIN_ENABLED:true}
-app.mail.contact-request.admin.address=${APP_MAIL_CONTACT_REQUEST_ADMIN_ADDRESS:infog@3d-fab.ch}
+app.mail.contact-request.admin.address=${APP_MAIL_CONTACT_REQUEST_ADMIN_ADDRESS:info@3d-fab.ch}
+app.mail.contact-request.customer.enabled=${APP_MAIL_CONTACT_REQUEST_CUSTOMER_ENABLED:true}
 app.frontend.base-url=${APP_FRONTEND_BASE_URL:http://localhost:4200}
 
 # Admin back-office authentication

backend/src/main/resources/templates/email/contact-request-customer.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title th:text="${emailTitle}">Contact request received</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+        }
+
+        .container {
+            max-width: 640px;
+            margin: 20px auto;
+            background-color: #ffffff;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+
+        h1 {
+            margin-top: 0;
+            color: #222222;
+        }
+
+        h2 {
+            margin-top: 18px;
+            color: #222222;
+            font-size: 18px;
+        }
+
+        p {
+            color: #444444;
+            line-height: 1.5;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            margin-top: 16px;
+        }
+
+        th,
+        td {
+            text-align: left;
+            vertical-align: top;
+            border-bottom: 1px solid #eeeeee;
+            padding: 10px 6px;
+            color: #333333;
+            word-break: break-word;
+        }
+
+        th {
+            width: 35%;
+            color: #222222;
+            background: #fafafa;
+        }
+
+        .footer {
+            margin-top: 24px;
+            font-size: 12px;
+            color: #888888;
+            border-top: 1px solid #eeeeee;
+            padding-top: 12px;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <h1 th:text="${headlineText}">We received your contact request</h1>
+    <p th:text="${greetingText}">Hi customer,</p>
+    <p th:text="${introText}">Thank you for contacting us. Our team will reply as soon as possible.</p>
+    <p>
+        <strong th:text="${requestIdHintText}">Please keep this request ID for future order references:</strong>
+        <span th:text="${requestId}">00000000-0000-0000-0000-000000000000</span>
+    </p>
+    <h2 th:text="${detailsTitleText}">Request details</h2>
+
+    <table>
+        <tr>
+            <th th:text="${labelRequestId}">Request ID</th>
+            <td th:text="${requestId}">00000000-0000-0000-0000-000000000000</td>
+        </tr>
+        <tr>
+            <th th:text="${labelDate}">Date</th>
+            <td th:text="${createdAt}">2026-03-03T10:00:00Z</td>
+        </tr>
+        <tr>
+            <th th:text="${labelRequestType}">Request type</th>
+            <td th:text="${requestType}">custom</td>
+        </tr>
+        <tr>
+            <th th:text="${labelCustomerType}">Customer type</th>
+            <td th:text="${customerType}">PRIVATE</td>
+        </tr>
+        <tr>
+            <th th:text="${labelName}">Name</th>
+            <td th:text="${name}">Mario Rossi</td>
+        </tr>
+        <tr>
+            <th th:text="${labelCompany}">Company</th>
+            <td th:text="${companyName}">3D Fab SA</td>
+        </tr>
+        <tr>
+            <th th:text="${labelContactPerson}">Contact person</th>
+            <td th:text="${contactPerson}">Mario Rossi</td>
+        </tr>
+        <tr>
+            <th th:text="${labelEmail}">Email</th>
+            <td th:text="${email}">cliente@example.com</td>
+        </tr>
+        <tr>
+            <th th:text="${labelPhone}">Phone</th>
+            <td th:text="${phone}">+41 00 000 00 00</td>
+        </tr>
+        <tr>
+            <th th:text="${labelMessage}">Message</th>
+            <td th:text="${message}">Testo richiesta cliente...</td>
+        </tr>
+        <tr>
+            <th th:text="${labelAttachments}">Attachments</th>
+            <td th:text="${attachmentsCount}">0</td>
+        </tr>
+    </table>
+    <p th:text="${supportText}">If you need help, reply to this email.</p>
+
+    <div class="footer">
+        <p>&copy; <span th:text="${currentYear}">2026</span> <span th:text="${footerText}">Automated request-receipt confirmation from 3D-Fab.</span></p>
+    </div>
+</div>
+</body>
+</html>

backend/src/main/resources/templates/email/order-shipped.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title th:text="${emailTitle}">Order Shipped</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f4f4f4;
+            margin: 0;
+            padding: 0;
+        }
+
+        .container {
+            max-width: 600px;
+            margin: 20px auto;
+            background-color: #ffffff;
+            padding: 20px;
+            border-radius: 8px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+
+        .header {
+            text-align: center;
+            border-bottom: 1px solid #eeeeee;
+            padding-bottom: 20px;
+            margin-bottom: 20px;
+        }
+
+        .header h1 {
+            color: #333333;
+        }
+
+        .content {
+            color: #555555;
+            line-height: 1.6;
+        }
+
+        .status-box {
+            background-color: #e9f3ff;
+            border: 1px solid #a9c8ef;
+            border-radius: 5px;
+            padding: 12px;
+            margin-top: 18px;
+        }
+
+        .order-box {
+            background-color: #f9f9f9;
+            border-radius: 5px;
+            padding: 12px;
+            margin-top: 18px;
+        }
+
+        .order-box th {
+            text-align: left;
+            padding-right: 18px;
+            vertical-align: top;
+        }
+
+        .footer {
+            text-align: center;
+            font-size: 0.9em;
+            color: #999999;
+            margin-top: 30px;
+            border-top: 1px solid #eeeeee;
+            padding-top: 20px;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <div class="header">
+        <h1 th:text="${headlineText}">Your order #00000000 has been shipped</h1>
+    </div>
+
+    <div class="content">
+        <p th:text="${greetingText}">Hi Customer,</p>
+        <p th:text="${introText}">Good news: your package is on its way.</p>
+
+        <div class="status-box">
+            <strong th:text="${statusText}">Current status: Shipped.</strong>
+        </div>
+
+        <div class="order-box">
+            <table>
+                <tr>
+                    <th th:text="${labelOrderNumber}">Order number</th>
+                    <td th:text="${orderNumber}">00000000</td>
+                </tr>
+                <tr>
+                    <th th:text="${labelTotal}">Total</th>
+                    <td th:text="${totalCost}">CHF 0.00</td>
+                </tr>
+            </table>
+        </div>
+
+        <p>
+            <span th:text="${orderDetailsCtaText}">View order status</span>:
+            <a th:href="${orderDetailsUrl}" th:text="${orderDetailsUrl}">https://example.com/en/co/00000000-0000-0000-0000-000000000000</a>
+        </p>
+        <p th:text="${supportText}">If you need assistance, reply to this email.</p>
+    </div>
+
+    <div class="footer">
+        <p>&copy; <span th:text="${currentYear}">2026</span> 3D-Fab</p>
+        <p th:text="${footerText}">Automated message.</p>
+    </div>
+</div>
+</body>
+</html>

backend/src/test/java/com/printcalculator/controller/OrderControllerPrivacyTest.java

@@ -0,0 +1,130 @@
+package com.printcalculator.controller;
+
+import com.printcalculator.dto.OrderDto;
+import com.printcalculator.entity.Order;
+import com.printcalculator.repository.OrderItemRepository;
+import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.PaymentRepository;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.OrderService;
+import com.printcalculator.service.order.OrderControllerService;
+import com.printcalculator.service.payment.PaymentService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
+import com.printcalculator.service.payment.TwintPaymentService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class OrderControllerPrivacyTest {
+
+    @Mock
+    private OrderService orderService;
+    @Mock
+    private OrderRepository orderRepo;
+    @Mock
+    private OrderItemRepository orderItemRepo;
+    @Mock
+    private StorageService storageService;
+    @Mock
+    private InvoicePdfRenderingService invoiceService;
+    @Mock
+    private QrBillService qrBillService;
+    @Mock
+    private TwintPaymentService twintPaymentService;
+    @Mock
+    private PaymentService paymentService;
+    @Mock
+    private PaymentRepository paymentRepo;
+
+    private OrderController controller;
+
+    @BeforeEach
+    void setUp() {
+        OrderControllerService orderControllerService = new OrderControllerService(
+                orderService,
+                orderRepo,
+                orderItemRepo,
+                storageService,
+                invoiceService,
+                qrBillService,
+                twintPaymentService,
+                paymentService,
+                paymentRepo
+        );
+        controller = new OrderController(orderControllerService);
+    }
+
+    @Test
+    void getOrder_pendingPayment_keepsPersonalData() {
+        UUID orderId = UUID.randomUUID();
+        Order order = buildOrder(orderId, "PENDING_PAYMENT");
+
+        when(orderRepo.findById(orderId)).thenReturn(Optional.of(order));
+        when(orderItemRepo.findByOrder_Id(orderId)).thenReturn(List.of());
+        when(paymentRepo.findByOrder_Id(orderId)).thenReturn(Optional.empty());
+
+        ResponseEntity<OrderDto> response = controller.getOrder(orderId);
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertNotNull(response.getBody());
+        assertEquals("customer@example.com", response.getBody().getCustomerEmail());
+        assertEquals("+41790000000", response.getBody().getCustomerPhone());
+        assertNotNull(response.getBody().getBillingAddress());
+    }
+
+    @Test
+    void getOrder_advancedStatuses_redactsPersonalData() {
+        List<String> statuses = List.of("IN_PRODUCTION", "SHIPPED", "COMPLETED");
+
+        for (String status : statuses) {
+            UUID orderId = UUID.randomUUID();
+            Order order = buildOrder(orderId, status);
+
+            when(orderRepo.findById(orderId)).thenReturn(Optional.of(order));
+            when(orderItemRepo.findByOrder_Id(orderId)).thenReturn(List.of());
+            when(paymentRepo.findByOrder_Id(orderId)).thenReturn(Optional.empty());
+
+            ResponseEntity<OrderDto> response = controller.getOrder(orderId);
+
+            assertEquals(HttpStatus.OK, response.getStatusCode());
+            assertNotNull(response.getBody());
+            assertNull(response.getBody().getCustomerEmail());
+            assertNull(response.getBody().getCustomerPhone());
+            assertNull(response.getBody().getBillingCustomerType());
+            assertNull(response.getBody().getBillingAddress());
+            assertNull(response.getBody().getShippingAddress());
+        }
+    }
+
+    private Order buildOrder(UUID orderId, String status) {
+        Order order = new Order();
+        order.setId(orderId);
+        order.setStatus(status);
+        order.setCustomerEmail("customer@example.com");
+        order.setCustomerPhone("+41790000000");
+        order.setBillingCustomerType("PRIVATE");
+        order.setBillingFirstName("Joe");
+        order.setBillingLastName("Kung");
+        order.setBillingAddressLine1("Via G. Pioda 1");
+        order.setBillingZip("6900");
+        order.setBillingCity("Lugano");
+        order.setBillingCountryCode("CH");
+        order.setShippingSameAsBilling(true);
+        return order;
+    }
+}

backend/src/test/java/com/printcalculator/controller/admin/AdminOrderControllerStatusValidationTest.java

@@ -6,15 +6,18 @@ import com.printcalculator.entity.Order;
 import com.printcalculator.repository.OrderItemRepository;
 import com.printcalculator.repository.OrderRepository;
 import com.printcalculator.repository.PaymentRepository;
-import com.printcalculator.service.InvoicePdfRenderingService;
-import com.printcalculator.service.PaymentService;
-import com.printcalculator.service.QrBillService;
-import com.printcalculator.service.StorageService;
+import com.printcalculator.repository.QuoteLineItemRepository;
+import com.printcalculator.service.order.AdminOrderControllerService;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.PaymentService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ResponseStatusException;
@@ -40,6 +43,8 @@ class AdminOrderControllerStatusValidationTest {
     @Mock
     private PaymentRepository paymentRepository;
     @Mock
+    private QuoteLineItemRepository quoteLineItemRepository;
+    @Mock
     private PaymentService paymentService;
     @Mock
     private StorageService storageService;
@@ -47,20 +52,25 @@ class AdminOrderControllerStatusValidationTest {
     private InvoicePdfRenderingService invoicePdfRenderingService;
     @Mock
     private QrBillService qrBillService;
+    @Mock
+    private ApplicationEventPublisher eventPublisher;
 
     private AdminOrderController controller;
 
     @BeforeEach
     void setUp() {
-        controller = new AdminOrderController(
+        AdminOrderControllerService adminOrderControllerService = new AdminOrderControllerService(
                 orderRepository,
                 orderItemRepository,
                 paymentRepository,
+                quoteLineItemRepository,
                 paymentService,
                 storageService,
                 invoicePdfRenderingService,
-                qrBillService
+                qrBillService,
+                eventPublisher
         );
+        controller = new AdminOrderController(adminOrderControllerService);
     }
 
     @Test
@@ -92,6 +102,7 @@ class AdminOrderControllerStatusValidationTest {
         order.setStatus("PENDING_PAYMENT");
 
         when(orderRepository.findById(orderId)).thenReturn(Optional.of(order));
+        when(orderRepository.save(any(Order.class))).thenAnswer(invocation -> invocation.getArgument(0));
         when(orderItemRepository.findByOrder_Id(orderId)).thenReturn(List.of());
         when(paymentRepository.findByOrder_Id(orderId)).thenReturn(Optional.empty());
 

backend/src/test/java/com/printcalculator/event/listener/OrderEmailListenerTest.java

@@ -4,9 +4,9 @@ import com.printcalculator.entity.Customer;
 import com.printcalculator.entity.Order;
 import com.printcalculator.event.OrderCreatedEvent;
 import com.printcalculator.repository.OrderItemRepository;
-import com.printcalculator.service.InvoicePdfRenderingService;
-import com.printcalculator.service.QrBillService;
-import com.printcalculator.service.StorageService;
+import com.printcalculator.service.payment.InvoicePdfRenderingService;
+import com.printcalculator.service.payment.QrBillService;
+import com.printcalculator.service.storage.StorageService;
 import com.printcalculator.service.email.EmailNotificationService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

backend/src/test/java/com/printcalculator/service/QuoteSessionTotalsServiceTest.java

@@ -0,0 +1,84 @@
+package com.printcalculator.service;
+
+import com.printcalculator.entity.PricingPolicy;
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.repository.PricingPolicyRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class QuoteSessionTotalsServiceTest {
+    private PricingPolicyRepository pricingRepo;
+    private QuoteCalculator quoteCalculator;
+    private QuoteSessionTotalsService service;
+
+    @BeforeEach
+    void setUp() {
+        pricingRepo = mock(PricingPolicyRepository.class);
+        quoteCalculator = mock(QuoteCalculator.class);
+        service = new QuoteSessionTotalsService(pricingRepo, quoteCalculator);
+    }
+
+    @Test
+    void compute_WithCadOnlySession_ShouldIncludeCadAndNoShipping() {
+        QuoteSession session = new QuoteSession();
+        session.setSetupCostChf(BigDecimal.ZERO);
+        session.setCadHours(BigDecimal.valueOf(2));
+        session.setCadHourlyRateChf(BigDecimal.valueOf(75));
+
+        PricingPolicy policy = new PricingPolicy();
+        when(pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc()).thenReturn(policy);
+        when(quoteCalculator.calculateSessionMachineCost(eq(policy), any(BigDecimal.class))).thenReturn(BigDecimal.ZERO);
+
+        QuoteSessionTotalsService.QuoteSessionTotals totals = service.compute(session, List.of());
+
+        assertAmountEquals("150.00", totals.cadTotalChf());
+        assertAmountEquals("0.00", totals.shippingCostChf());
+        assertAmountEquals("150.00", totals.itemsTotalChf());
+        assertAmountEquals("150.00", totals.grandTotalChf());
+    }
+
+    @Test
+    void compute_WithPrintItemAndCad_ShouldSumEverything() {
+        QuoteSession session = new QuoteSession();
+        session.setSetupCostChf(new BigDecimal("5.00"));
+        session.setCadHours(new BigDecimal("1.50"));
+        session.setCadHourlyRateChf(new BigDecimal("60.00"));
+
+        QuoteLineItem item = new QuoteLineItem();
+        item.setQuantity(2);
+        item.setUnitPriceChf(new BigDecimal("10.00"));
+        item.setPrintTimeSeconds(3600);
+        item.setBoundingBoxXMm(new BigDecimal("10"));
+        item.setBoundingBoxYMm(new BigDecimal("10"));
+        item.setBoundingBoxZMm(new BigDecimal("10"));
+
+        PricingPolicy policy = new PricingPolicy();
+        when(pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc()).thenReturn(policy);
+        when(quoteCalculator.calculateSessionMachineCost(policy, new BigDecimal("2.0000")))
+                .thenReturn(new BigDecimal("3.00"));
+
+        QuoteSessionTotalsService.QuoteSessionTotals totals = service.compute(session, List.of(item));
+
+        assertAmountEquals("23.00", totals.printItemsTotalChf());
+        assertAmountEquals("90.00", totals.cadTotalChf());
+        assertAmountEquals("113.00", totals.itemsTotalChf());
+        assertAmountEquals("2.00", totals.shippingCostChf());
+        assertAmountEquals("120.00", totals.grandTotalChf());
+    }
+
+    private void assertAmountEquals(String expected, BigDecimal actual) {
+        assertTrue(new BigDecimal(expected).compareTo(actual) == 0,
+                "Expected " + expected + " but got " + actual);
+    }
+}

db.sql

@@ -599,7 +599,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS ux_customers_email
 CREATE TABLE IF NOT EXISTS quote_sessions
 (
     quote_session_id   uuid PRIMARY KEY        DEFAULT gen_random_uuid(),
-    status             text           NOT NULL CHECK (status IN ('ACTIVE', 'EXPIRED', 'CONVERTED')),
+    status             text           NOT NULL CHECK (status IN ('ACTIVE', 'CAD_ACTIVE', 'EXPIRED', 'CONVERTED')),
     pricing_version    text           NOT NULL,
 
     -- Parametri "globali" (dalla tua UI avanzata)
@@ -612,6 +612,9 @@ CREATE TABLE IF NOT EXISTS quote_sessions
     notes              text,
 
     setup_cost_chf     numeric(12, 2) NOT NULL DEFAULT 0.00,
+    source_request_id  uuid,
+    cad_hours          numeric(10, 2),
+    cad_hourly_rate_chf numeric(10, 2),
 
     created_at         timestamptz    NOT NULL DEFAULT now(),
     expires_at         timestamptz    NOT NULL,
@@ -624,6 +627,25 @@ CREATE INDEX IF NOT EXISTS ix_quote_sessions_status
 CREATE INDEX IF NOT EXISTS ix_quote_sessions_expires_at
     ON quote_sessions (expires_at);
 
+CREATE INDEX IF NOT EXISTS ix_quote_sessions_source_request
+    ON quote_sessions (source_request_id);
+
+ALTER TABLE quote_sessions
+    ADD COLUMN IF NOT EXISTS source_request_id uuid;
+
+ALTER TABLE quote_sessions
+    ADD COLUMN IF NOT EXISTS cad_hours numeric(10, 2);
+
+ALTER TABLE quote_sessions
+    ADD COLUMN IF NOT EXISTS cad_hourly_rate_chf numeric(10, 2);
+
+ALTER TABLE quote_sessions
+    DROP CONSTRAINT IF EXISTS quote_sessions_status_check;
+
+ALTER TABLE quote_sessions
+    ADD CONSTRAINT quote_sessions_status_check
+        CHECK (status IN ('ACTIVE', 'CAD_ACTIVE', 'EXPIRED', 'CONVERTED'));
+
 -- =========================
 -- QUOTE LINE ITEMS (1 file = 1 riga)
 -- =========================
@@ -638,6 +660,12 @@ CREATE TABLE IF NOT EXISTS quote_line_items
     quantity           integer     NOT NULL DEFAULT 1 CHECK (quantity >= 1),
     color_code         text,  -- es: white/black o codice interno
     filament_variant_id bigint REFERENCES filament_variant (filament_variant_id),
+    material_code      text,
+    nozzle_diameter_mm numeric(5, 2),
+    layer_height_mm    numeric(6, 3),
+    infill_pattern     text,
+    infill_percent     integer CHECK (infill_percent BETWEEN 0 AND 100),
+    supports_enabled   boolean,
 
     -- Output slicing / calcolo
     bounding_box_x_mm  numeric(10, 3),
@@ -658,6 +686,24 @@ CREATE TABLE IF NOT EXISTS quote_line_items
 CREATE INDEX IF NOT EXISTS ix_quote_line_items_session
     ON quote_line_items (quote_session_id);
 
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS material_code text;
+
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS nozzle_diameter_mm numeric(5, 2);
+
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS layer_height_mm numeric(6, 3);
+
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS infill_pattern text;
+
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS infill_percent integer;
+
+ALTER TABLE quote_line_items
+    ADD COLUMN IF NOT EXISTS supports_enabled boolean;
+
 -- Vista utile per totale quote
 CREATE OR REPLACE VIEW quote_session_totals AS
 SELECT qs.quote_session_id,
@@ -676,6 +722,7 @@ CREATE TABLE IF NOT EXISTS orders
 (
     order_id                 uuid PRIMARY KEY        DEFAULT gen_random_uuid(),
     source_quote_session_id  uuid REFERENCES quote_sessions (quote_session_id),
+    source_request_id        uuid,
 
     status                   text           NOT NULL CHECK (status IN (
                                                                        'PENDING_PAYMENT', 'PAID', 'IN_PRODUCTION',
@@ -717,6 +764,10 @@ CREATE TABLE IF NOT EXISTS orders
     discount_chf             numeric(12, 2) NOT NULL DEFAULT 0.00,
 
     subtotal_chf             numeric(12, 2) NOT NULL DEFAULT 0.00,
+    is_cad_order             boolean        NOT NULL DEFAULT false,
+    cad_hours                numeric(10, 2),
+    cad_hourly_rate_chf      numeric(10, 2),
+    cad_total_chf            numeric(12, 2) NOT NULL DEFAULT 0.00,
     total_chf                numeric(12, 2) NOT NULL DEFAULT 0.00,
 
     created_at               timestamptz    NOT NULL DEFAULT now(),
@@ -730,6 +781,24 @@ CREATE INDEX IF NOT EXISTS ix_orders_status
 CREATE INDEX IF NOT EXISTS ix_orders_customer_email
     ON orders (lower(customer_email));
 
+CREATE INDEX IF NOT EXISTS ix_orders_source_request
+    ON orders (source_request_id);
+
+ALTER TABLE orders
+    ADD COLUMN IF NOT EXISTS source_request_id uuid;
+
+ALTER TABLE orders
+    ADD COLUMN IF NOT EXISTS is_cad_order boolean NOT NULL DEFAULT false;
+
+ALTER TABLE orders
+    ADD COLUMN IF NOT EXISTS cad_hours numeric(10, 2);
+
+ALTER TABLE orders
+    ADD COLUMN IF NOT EXISTS cad_hourly_rate_chf numeric(10, 2);
+
+ALTER TABLE orders
+    ADD COLUMN IF NOT EXISTS cad_total_chf numeric(12, 2) NOT NULL DEFAULT 0.00;
+
 -- =========================
 -- ORDER ITEMS (1 file 3D = 1 riga, file salvato su disco)
 -- =========================
@@ -849,3 +918,17 @@ CREATE TABLE IF NOT EXISTS custom_quote_request_attachments
 
 CREATE INDEX IF NOT EXISTS ix_custom_quote_attachments_request
     ON custom_quote_request_attachments (request_id);
+
+ALTER TABLE quote_sessions
+    DROP CONSTRAINT IF EXISTS fk_quote_sessions_source_request;
+
+ALTER TABLE quote_sessions
+    ADD CONSTRAINT fk_quote_sessions_source_request
+        FOREIGN KEY (source_request_id) REFERENCES custom_quote_requests (request_id);
+
+ALTER TABLE orders
+    DROP CONSTRAINT IF EXISTS fk_orders_source_request;
+
+ALTER TABLE orders
+    ADD CONSTRAINT fk_orders_source_request
+        FOREIGN KEY (source_request_id) REFERENCES custom_quote_requests (request_id);

docker-compose.deploy.yml

@@ -13,6 +13,7 @@ services:
       - CLAMAV_HOST=${CLAMAV_HOST}
       - CLAMAV_PORT=${CLAMAV_PORT}
       - CLAMAV_ENABLED=${CLAMAV_ENABLED}
+      - TWINT_PAYMENT_URL=${TWINT_PAYMENT_URL:-}
       - MAIL_HOST=${MAIL_HOST:-mail.infomaniak.com}
       - MAIL_PORT=${MAIL_PORT:-587}
       - MAIL_USERNAME=${MAIL_USERNAME:-info@3d-fab.ch}

frontend/public/robots.txt

@@ -0,0 +1,21 @@
+User-agent: *
+Allow: /
+
+Disallow: /admin
+Disallow: /admin/
+Disallow: /*/admin
+Disallow: /*/admin/
+Disallow: /order/
+Disallow: /*/order/
+Disallow: /co/
+Disallow: /*/co/
+Disallow: /checkout
+Disallow: /checkout/
+Disallow: /*/checkout
+Disallow: /*/checkout/
+Disallow: /shop
+Disallow: /shop/
+Disallow: /*/shop
+Disallow: /*/shop/
+
+Sitemap: https://3d-fab.ch/sitemap.xml

frontend/public/sitemap.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+  xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml"
+>
+  <url>
+    <loc>https://3d-fab.ch/it</loc>
+    <xhtml:link rel="alternate" hreflang="it" href="https://3d-fab.ch/it" />
+    <xhtml:link rel="alternate" hreflang="en" href="https://3d-fab.ch/en" />
+    <xhtml:link rel="alternate" hreflang="de" href="https://3d-fab.ch/de" />
+    <xhtml:link rel="alternate" hreflang="fr" href="https://3d-fab.ch/fr" />
+    <xhtml:link rel="alternate" hreflang="x-default" href="https://3d-fab.ch/it" />
+    <changefreq>weekly</changefreq>
+    <priority>1.0</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/calculator/basic</loc>
+    <xhtml:link
+      rel="alternate"
+      hreflang="it"
+      href="https://3d-fab.ch/it/calculator/basic"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="en"
+      href="https://3d-fab.ch/en/calculator/basic"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="de"
+      href="https://3d-fab.ch/de/calculator/basic"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="fr"
+      href="https://3d-fab.ch/fr/calculator/basic"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="x-default"
+      href="https://3d-fab.ch/it/calculator/basic"
+    />
+    <changefreq>weekly</changefreq>
+    <priority>0.9</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/calculator/advanced</loc>
+    <xhtml:link
+      rel="alternate"
+      hreflang="it"
+      href="https://3d-fab.ch/it/calculator/advanced"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="en"
+      href="https://3d-fab.ch/en/calculator/advanced"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="de"
+      href="https://3d-fab.ch/de/calculator/advanced"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="fr"
+      href="https://3d-fab.ch/fr/calculator/advanced"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="x-default"
+      href="https://3d-fab.ch/it/calculator/advanced"
+    />
+    <changefreq>weekly</changefreq>
+    <priority>0.8</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/about</loc>
+    <xhtml:link rel="alternate" hreflang="it" href="https://3d-fab.ch/it/about" />
+    <xhtml:link rel="alternate" hreflang="en" href="https://3d-fab.ch/en/about" />
+    <xhtml:link rel="alternate" hreflang="de" href="https://3d-fab.ch/de/about" />
+    <xhtml:link rel="alternate" hreflang="fr" href="https://3d-fab.ch/fr/about" />
+    <xhtml:link
+      rel="alternate"
+      hreflang="x-default"
+      href="https://3d-fab.ch/it/about"
+    />
+    <changefreq>monthly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/contact</loc>
+    <xhtml:link
+      rel="alternate"
+      hreflang="it"
+      href="https://3d-fab.ch/it/contact"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="en"
+      href="https://3d-fab.ch/en/contact"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="de"
+      href="https://3d-fab.ch/de/contact"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="fr"
+      href="https://3d-fab.ch/fr/contact"
+    />
+    <xhtml:link
+      rel="alternate"
+      hreflang="x-default"
+      href="https://3d-fab.ch/it/contact"
+    />
+    <changefreq>monthly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/privacy</loc>
+    <xhtml:link rel="alternate" hreflang="it" href="https://3d-fab.ch/it/privacy" />
+    <xhtml:link rel="alternate" hreflang="en" href="https://3d-fab.ch/en/privacy" />
+    <xhtml:link rel="alternate" hreflang="de" href="https://3d-fab.ch/de/privacy" />
+    <xhtml:link rel="alternate" hreflang="fr" href="https://3d-fab.ch/fr/privacy" />
+    <xhtml:link
+      rel="alternate"
+      hreflang="x-default"
+      href="https://3d-fab.ch/it/privacy"
+    />
+    <changefreq>yearly</changefreq>
+    <priority>0.4</priority>
+  </url>
+  <url>
+    <loc>https://3d-fab.ch/it/terms</loc>
+    <xhtml:link rel="alternate" hreflang="it" href="https://3d-fab.ch/it/terms" />
+    <xhtml:link rel="alternate" hreflang="en" href="https://3d-fab.ch/en/terms" />
+    <xhtml:link rel="alternate" hreflang="de" href="https://3d-fab.ch/de/terms" />
+    <xhtml:link rel="alternate" hreflang="fr" href="https://3d-fab.ch/fr/terms" />
+    <xhtml:link rel="alternate" hreflang="x-default" href="https://3d-fab.ch/it/terms" />
+    <changefreq>yearly</changefreq>
+    <priority>0.4</priority>
+  </url>
+</urlset>

frontend/src/app/app.component.ts

@@ -1,5 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
+import { SeoService } from './core/services/seo.service';
 
 @Component({
   selector: 'app-root',
@@ -8,4 +9,6 @@ import { RouterOutlet } from '@angular/router';
   templateUrl: './app.component.html',
   styleUrl: './app.component.scss',
 })
-export class AppComponent {}
+export class AppComponent {
+  private readonly seoService = inject(SeoService);
+}

frontend/src/app/app.routes.ts

@@ -5,6 +5,11 @@ const appChildRoutes: Routes = [
     path: '',
     loadComponent: () =>
       import('./features/home/home.component').then((m) => m.HomeComponent),
+    data: {
+      seoTitle: '3D fab | Stampa 3D su misura',
+      seoDescription:
+        'Servizio di stampa 3D con preventivo online immediato per prototipi, piccole serie e pezzi personalizzati.',
+    },
   },
   {
     path: 'calculator',
@@ -12,21 +17,53 @@ const appChildRoutes: Routes = [
       import('./features/calculator/calculator.routes').then(
         (m) => m.CALCULATOR_ROUTES,
       ),
+    data: {
+      seoTitle: 'Calcolatore preventivo stampa 3D | 3D fab',
+      seoDescription:
+        'Carica il file 3D e ottieni prezzo e tempi in pochi secondi con slicing reale.',
+    },
   },
   {
     path: 'shop',
     loadChildren: () =>
       import('./features/shop/shop.routes').then((m) => m.SHOP_ROUTES),
+    data: {
+      seoTitle: 'Shop 3D fab',
+      seoDescription:
+        'Catalogo prodotti stampati in 3D e soluzioni tecniche pronte all uso.',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: 'about',
     loadChildren: () =>
       import('./features/about/about.routes').then((m) => m.ABOUT_ROUTES),
+    data: {
+      seoTitle: 'Chi siamo | 3D fab',
+      seoDescription:
+        'Scopri il team 3D fab e il laboratorio di stampa 3D con sedi in Ticino e Bienne.',
+    },
   },
   {
     path: 'contact',
     loadChildren: () =>
       import('./features/contact/contact.routes').then((m) => m.CONTACT_ROUTES),
+    data: {
+      seoTitle: 'Contatti | 3D fab',
+      seoDescription:
+        'Contatta 3D fab per preventivi, supporto tecnico e richieste personalizzate di stampa 3D.',
+    },
+  },
+  {
+    path: 'checkout/cad',
+    loadComponent: () =>
+      import('./features/checkout/checkout.component').then(
+        (m) => m.CheckoutComponent,
+      ),
+    data: {
+      seoTitle: 'Checkout | 3D fab',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: 'checkout',
@@ -34,16 +71,28 @@ const appChildRoutes: Routes = [
       import('./features/checkout/checkout.component').then(
         (m) => m.CheckoutComponent,
       ),
+    data: {
+      seoTitle: 'Checkout | 3D fab',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: 'order/:orderId',
     loadComponent: () =>
       import('./features/order/order.component').then((m) => m.OrderComponent),
+    data: {
+      seoTitle: 'Ordine | 3D fab',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: 'co/:orderId',
     loadComponent: () =>
       import('./features/order/order.component').then((m) => m.OrderComponent),
+    data: {
+      seoTitle: 'Ordine | 3D fab',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: '',
@@ -54,6 +103,10 @@ const appChildRoutes: Routes = [
     path: 'admin',
     loadChildren: () =>
       import('./features/admin/admin.routes').then((m) => m.ADMIN_ROUTES),
+    data: {
+      seoTitle: 'Admin | 3D fab',
+      seoRobots: 'noindex, nofollow',
+    },
   },
   {
     path: '**',

frontend/src/app/core/layout/navbar.component.html

@@ -53,7 +53,7 @@
         }
       </select>
 
-      <div class="icon-placeholder">
+      <div class="icon-placeholder" routerLink="/admin">
         <svg
           xmlns="http://www.w3.org/2000/svg"
           width="20"

frontend/src/app/core/layout/navbar.component.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { RouterLink, RouterLinkActive } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { LanguageService } from '../services/language.service';
+import { routes } from '../../app.routes';
 
 @Component({
   selector: 'app-navbar',
@@ -37,4 +38,6 @@ export class NavbarComponent {
   closeMenu() {
     this.isMenuOpen = false;
   }
+
+  protected readonly routes = routes;
 }

frontend/src/app/core/services/quote-request.service.ts

@@ -6,6 +6,7 @@ import { environment } from '../../../environments/environment';
 export interface QuoteRequestDto {
   requestType: string;
   customerType: string;
+  language?: 'it' | 'en' | 'de' | 'fr';
   email: string;
   phone?: string;
   name?: string;

frontend/src/app/core/services/seo.service.ts

@@ -0,0 +1,129 @@
+import { DOCUMENT } from '@angular/common';
+import { Inject, Injectable } from '@angular/core';
+import { Title, Meta } from '@angular/platform-browser';
+import { ActivatedRouteSnapshot, NavigationEnd, Router } from '@angular/router';
+import { filter } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SeoService {
+  private readonly defaultTitle = '3D fab | Stampa 3D su misura';
+  private readonly defaultDescription =
+    'Stampa 3D su misura con preventivo online immediato. Carica il file, scegli materiale e qualità, ricevi prezzo e tempi in pochi secondi.';
+  private readonly supportedLangs = new Set(['it', 'en', 'de', 'fr']);
+
+  constructor(
+    private router: Router,
+    private titleService: Title,
+    private metaService: Meta,
+    @Inject(DOCUMENT) private document: Document,
+  ) {
+    this.applyRouteSeo(this.router.routerState.snapshot.root);
+    this.router.events
+      .pipe(
+        filter(
+          (event): event is NavigationEnd => event instanceof NavigationEnd,
+        ),
+      )
+      .subscribe(() => {
+        this.applyRouteSeo(this.router.routerState.snapshot.root);
+      });
+  }
+
+  private applyRouteSeo(rootSnapshot: ActivatedRouteSnapshot): void {
+    const mergedData = this.getMergedRouteData(rootSnapshot);
+    const title = this.asString(mergedData['seoTitle']) ?? this.defaultTitle;
+    const description =
+      this.asString(mergedData['seoDescription']) ?? this.defaultDescription;
+    const robots = this.asString(mergedData['seoRobots']) ?? 'index, follow';
+
+    this.titleService.setTitle(title);
+    this.metaService.updateTag({ name: 'description', content: description });
+    this.metaService.updateTag({ name: 'robots', content: robots });
+    this.metaService.updateTag({ property: 'og:title', content: title });
+    this.metaService.updateTag({
+      property: 'og:description',
+      content: description,
+    });
+    this.metaService.updateTag({ property: 'og:type', content: 'website' });
+    this.metaService.updateTag({ name: 'twitter:card', content: 'summary' });
+
+    const cleanPath = this.getCleanPath(this.router.url);
+    const canonical = `${this.document.location.origin}${cleanPath}`;
+    this.metaService.updateTag({ property: 'og:url', content: canonical });
+    this.updateCanonicalTag(canonical);
+    this.updateLangAndAlternates(cleanPath);
+  }
+
+  private getMergedRouteData(
+    snapshot: ActivatedRouteSnapshot,
+  ): Record<string, unknown> {
+    const merged: Record<string, unknown> = {};
+    let cursor: ActivatedRouteSnapshot | null = snapshot;
+    while (cursor) {
+      Object.assign(merged, cursor.data ?? {});
+      cursor = cursor.firstChild;
+    }
+    return merged;
+  }
+
+  private asString(value: unknown): string | undefined {
+    return typeof value === 'string' ? value : undefined;
+  }
+
+  private getCleanPath(url: string): string {
+    const path = (url || '/').split('?')[0].split('#')[0];
+    return path || '/';
+  }
+
+  private updateCanonicalTag(url: string): void {
+    let link = this.document.head.querySelector(
+      'link[rel="canonical"]',
+    ) as HTMLLinkElement | null;
+    if (!link) {
+      link = this.document.createElement('link');
+      link.setAttribute('rel', 'canonical');
+      this.document.head.appendChild(link);
+    }
+    link.setAttribute('href', url);
+  }
+
+  private updateLangAndAlternates(path: string): void {
+    const segments = path.split('/').filter(Boolean);
+    const firstSegment = segments[0]?.toLowerCase();
+    const hasLang = Boolean(
+      firstSegment && this.supportedLangs.has(firstSegment),
+    );
+    const lang = hasLang ? firstSegment : 'it';
+    const suffixSegments = hasLang ? segments.slice(1) : segments;
+    const suffix =
+      suffixSegments.length > 0 ? `/${suffixSegments.join('/')}` : '';
+
+    this.document.documentElement.lang = lang;
+
+    this.document.head
+      .querySelectorAll('link[rel="alternate"][data-seo-managed="true"]')
+      .forEach((node) => node.remove());
+
+    for (const alt of ['it', 'en', 'de', 'fr']) {
+      this.appendAlternateLink(
+        alt,
+        `${this.document.location.origin}/${alt}${suffix}`,
+      );
+    }
+    this.appendAlternateLink(
+      'x-default',
+      `${this.document.location.origin}/it${suffix}`,
+    );
+  }
+
+  private appendAlternateLink(hreflang: string, href: string): void {
+    const link = this.document.createElement('link');
+    link.setAttribute('rel', 'alternate');
+    link.setAttribute('hreflang', hreflang);
+    link.setAttribute('href', href);
+    link.setAttribute('data-seo-managed', 'true');
+    this.document.head.appendChild(link);
+  }
+}

frontend/src/app/features/about/about-page.component.ts

@@ -16,6 +16,7 @@ type PassionId =
   | 'woodworking'
   | 'van-life'
   | 'coffee'
+  | 'cooking'
   | 'software-development';
 
 interface PassionChip {
@@ -50,6 +51,7 @@ export class AboutPageComponent {
     { id: 'snowboard', labelKey: 'ABOUT.PASSION_SNOWBOARD' },
     { id: 'van-life', labelKey: 'ABOUT.PASSION_VAN_LIFE' },
     { id: 'self-hosting', labelKey: 'ABOUT.PASSION_SELF_HOSTING' },
+    { id: 'cooking', labelKey: 'ABOUT.PASSION_COOKING' },
     {
       id: 'snowboard-instructor',
       labelKey: 'ABOUT.PASSION_SNOWBOARD_INSTRUCTOR',
@@ -67,6 +69,7 @@ export class AboutPageComponent {
       'print-3d',
       'travel',
       'coffee',
+      'cooking',
       'software-development',
     ],
     matteo: [

frontend/src/app/features/about/about.routes.ts

@@ -2,5 +2,13 @@ import { Routes } from '@angular/router';
 import { AboutPageComponent } from './about-page.component';
 
 export const ABOUT_ROUTES: Routes = [
-  { path: '', component: AboutPageComponent },
+  {
+    path: '',
+    component: AboutPageComponent,
+    data: {
+      seoTitle: 'Chi siamo | 3D fab',
+      seoDescription:
+        'Siamo un laboratorio di stampa 3D orientato a prototipi, ricambi e produzioni su misura.',
+    },
+  },
 ];

frontend/src/app/features/admin/admin.routes.ts

@@ -50,6 +50,13 @@ export const ADMIN_ROUTES: Routes = [
             (m) => m.AdminSessionsComponent,
           ),
       },
+      {
+        path: 'cad-invoices',
+        loadComponent: () =>
+          import('./pages/admin-cad-invoices.component').then(
+            (m) => m.AdminCadInvoicesComponent,
+          ),
+      },
     ],
   },
 ];

frontend/src/app/features/admin/pages/admin-cad-invoices.component.html

@@ -0,0 +1,149 @@
+<section class="cad-page">
+  <header class="page-header">
+    <div>
+      <h1>Fatture CAD</h1>
+      <p>
+        Crea un checkout CAD partendo da una sessione esistente (opzionale) e
+        gestisci lo stato fino all'ordine.
+      </p>
+    </div>
+    <button type="button" (click)="loadCadInvoices()" [disabled]="loading">
+      Aggiorna
+    </button>
+  </header>
+
+  <p class="error" *ngIf="errorMessage">{{ errorMessage }}</p>
+  <p class="success" *ngIf="successMessage">{{ successMessage }}</p>
+
+  <section class="create-box">
+    <h2>Crea nuova fattura CAD</h2>
+    <div class="form-grid">
+      <label>
+        <span>ID Sessione (opzionale)</span>
+        <input
+          [(ngModel)]="form.sessionId"
+          placeholder="UUID sessione quote"
+          type="text"
+        />
+      </label>
+      <label>
+        <span>ID Richiesta Contatto (opzionale)</span>
+        <input
+          [(ngModel)]="form.sourceRequestId"
+          placeholder="UUID richiesta contatto"
+          type="text"
+        />
+      </label>
+      <label>
+        <span>Ore CAD</span>
+        <input [(ngModel)]="form.cadHours" min="0.1" step="0.1" type="number" />
+      </label>
+      <label>
+        <span>Tariffa CAD CHF/h (opzionale)</span>
+        <input
+          [(ngModel)]="form.cadHourlyRateChf"
+          placeholder="Se vuoto usa pricing policy attiva"
+          min="0"
+          step="0.05"
+          type="number"
+        />
+      </label>
+      <label class="notes-field">
+        <span>Nota (opzionale)</span>
+        <textarea
+          [(ngModel)]="form.notes"
+          placeholder="Nota visibile nel checkout CAD (es. dettagli lavorazione)"
+          rows="3"
+        ></textarea>
+      </label>
+    </div>
+    <div class="create-actions">
+      <button type="button" (click)="createCadInvoice()" [disabled]="creating">
+        {{ creating ? "Creazione..." : "Crea link checkout CAD" }}
+      </button>
+    </div>
+  </section>
+
+  <section class="table-wrap" *ngIf="!loading; else loadingTpl">
+    <table>
+      <thead>
+        <tr>
+          <th>Sessione</th>
+          <th>Richiesta</th>
+          <th>Ore CAD</th>
+          <th>Tariffa</th>
+          <th>Totale CAD</th>
+          <th>Totale ordine</th>
+          <th>Stato sessione</th>
+          <th>Nota</th>
+          <th>Ordine</th>
+          <th>Azioni</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let row of invoices">
+          <td [title]="row.sessionId" [appCopyOnClick]="row.sessionId">
+            {{ row.sessionId | slice: 0 : 8 }}
+          </td>
+          <td
+            [title]="row.sourceRequestId || ''"
+            [appCopyOnClick]="row.sourceRequestId"
+          >
+            {{ row.sourceRequestId || "-" }}
+          </td>
+          <td>{{ row.cadHours }}</td>
+          <td>{{ row.cadHourlyRateChf | currency: "CHF" }}</td>
+          <td>{{ row.cadTotalChf | currency: "CHF" }}</td>
+          <td>{{ row.grandTotalChf | currency: "CHF" }}</td>
+          <td>{{ row.sessionStatus }}</td>
+          <td class="notes-cell" [title]="row.notes || ''">
+            {{ row.notes || "-" }}
+          </td>
+          <td>
+            <span
+              *ngIf="row.convertedOrderId; else noOrder"
+              [title]="row.convertedOrderId || ''"
+              [appCopyOnClick]="row.convertedOrderId"
+            >
+              {{ row.convertedOrderId | slice: 0 : 8 }} ({{
+                row.convertedOrderStatus || "-"
+              }})
+            </span>
+            <ng-template #noOrder>-</ng-template>
+          </td>
+          <td class="actions">
+            <button
+              type="button"
+              class="ghost"
+              (click)="openCheckout(row.checkoutPath)"
+            >
+              Apri checkout
+            </button>
+            <button
+              type="button"
+              class="ghost"
+              (click)="copyCheckout(row.checkoutPath)"
+            >
+              Copia link
+            </button>
+            <button
+              type="button"
+              class="ghost"
+              *ngIf="row.convertedOrderId"
+              (click)="downloadInvoice(row.convertedOrderId)"
+            >
+              Scarica fattura
+            </button>
+          </td>
+        </tr>
+        <tr *ngIf="invoices.length === 0">
+          <td colspan="10">Nessuna fattura CAD trovata.</td>
+        </tr>
+      </tbody>
+    </table>
+  </section>
+</section>
+
+<ng-template #loadingTpl>
+  <p>Caricamento fatture CAD...</p>
+</ng-template>

frontend/src/app/features/admin/pages/admin-cad-invoices.component.scss

@@ -0,0 +1,140 @@
+.cad-page {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-5);
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  gap: var(--space-4);
+  align-items: flex-start;
+}
+
+.page-header h1 {
+  margin: 0;
+}
+
+.page-header p {
+  margin: var(--space-2) 0 0;
+  color: var(--color-text-muted);
+}
+
+button {
+  border: 0;
+  border-radius: var(--radius-md);
+  padding: var(--space-2) var(--space-4);
+  background: var(--color-brand);
+  color: var(--color-neutral-900);
+  font-weight: 600;
+  cursor: pointer;
+}
+
+button:disabled {
+  opacity: 0.65;
+  cursor: not-allowed;
+}
+
+.create-box {
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  background: var(--color-bg-card);
+  padding: var(--space-4);
+}
+
+.create-box h2 {
+  margin-top: 0;
+}
+
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: var(--space-3);
+}
+
+.form-grid label {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-1);
+}
+
+.form-grid span {
+  font-size: 0.9rem;
+  color: var(--color-text-muted);
+}
+
+.form-grid input {
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-sm);
+  padding: var(--space-2);
+}
+
+.notes-field {
+  grid-column: 1 / -1;
+}
+
+.form-grid textarea {
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-sm);
+  padding: var(--space-2);
+  resize: vertical;
+}
+
+.create-actions {
+  margin-top: var(--space-3);
+}
+
+.table-wrap {
+  overflow: auto;
+}
+
+table {
+  width: 100%;
+  border-collapse: collapse;
+  min-width: 1100px;
+}
+
+th,
+td {
+  border-bottom: 1px solid var(--color-border);
+  padding: var(--space-2);
+  text-align: left;
+}
+
+.notes-cell {
+  max-width: 280px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.actions {
+  display: flex;
+  gap: var(--space-2);
+  flex-wrap: wrap;
+}
+
+.ghost {
+  background: transparent;
+  border: 1px solid var(--color-border);
+  color: var(--color-text);
+}
+
+.error {
+  color: var(--color-danger-500);
+}
+
+.success {
+  color: var(--color-success-500);
+}
+
+@media (max-width: 880px) {
+  .page-header {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .form-grid {
+    grid-template-columns: 1fr;
+  }
+}

frontend/src/app/features/admin/pages/admin-cad-invoices.component.ts

@@ -0,0 +1,158 @@
+import { CommonModule } from '@angular/common';
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import {
+  AdminCadInvoice,
+  AdminOperationsService,
+} from '../services/admin-operations.service';
+import { AdminOrdersService } from '../services/admin-orders.service';
+import { CopyOnClickDirective } from '../../../shared/directives/copy-on-click.directive';
+
+@Component({
+  selector: 'app-admin-cad-invoices',
+  standalone: true,
+  imports: [CommonModule, FormsModule, CopyOnClickDirective],
+  templateUrl: './admin-cad-invoices.component.html',
+  styleUrl: './admin-cad-invoices.component.scss',
+})
+export class AdminCadInvoicesComponent implements OnInit {
+  private readonly adminOperationsService = inject(AdminOperationsService);
+  private readonly adminOrdersService = inject(AdminOrdersService);
+
+  invoices: AdminCadInvoice[] = [];
+  loading = false;
+  creating = false;
+  errorMessage: string | null = null;
+  successMessage: string | null = null;
+
+  form = {
+    sessionId: '',
+    sourceRequestId: '',
+    cadHours: 1,
+    cadHourlyRateChf: '',
+    notes: '',
+  };
+
+  ngOnInit(): void {
+    this.loadCadInvoices();
+  }
+
+  loadCadInvoices(): void {
+    this.loading = true;
+    this.errorMessage = null;
+    this.adminOperationsService.listCadInvoices().subscribe({
+      next: (rows) => {
+        this.invoices = rows;
+        this.loading = false;
+      },
+      error: () => {
+        this.loading = false;
+        this.errorMessage = 'Impossibile caricare le fatture CAD.';
+      },
+    });
+  }
+
+  createCadInvoice(): void {
+    if (this.creating) {
+      return;
+    }
+
+    const cadHours = Number(this.form.cadHours);
+    if (!Number.isFinite(cadHours) || cadHours <= 0) {
+      this.errorMessage = 'Inserisci ore CAD valide (> 0).';
+      return;
+    }
+
+    this.creating = true;
+    this.errorMessage = null;
+    this.successMessage = null;
+
+    let payload: {
+      sessionId?: string;
+      sourceRequestId?: string;
+      cadHours: number;
+      cadHourlyRateChf?: number;
+      notes?: string;
+    };
+
+    try {
+      const sessionIdRaw = String(this.form.sessionId ?? '').trim();
+      const sourceRequestIdRaw = String(this.form.sourceRequestId ?? '').trim();
+      const cadRateRaw = String(this.form.cadHourlyRateChf ?? '').trim();
+      const notesRaw = String(this.form.notes ?? '').trim();
+
+      payload = {
+        sessionId: sessionIdRaw || undefined,
+        sourceRequestId: sourceRequestIdRaw || undefined,
+        cadHours,
+        cadHourlyRateChf:
+          cadRateRaw.length > 0 && Number.isFinite(Number(cadRateRaw))
+            ? Number(cadRateRaw)
+            : undefined,
+        notes: notesRaw.length > 0 ? notesRaw : undefined,
+      };
+    } catch {
+      this.creating = false;
+      this.errorMessage = 'Valori form non validi.';
+      return;
+    }
+
+    this.adminOperationsService.createCadInvoice(payload).subscribe({
+      next: (created) => {
+        this.creating = false;
+        this.successMessage = `Fattura CAD pronta. Sessione: ${created.sessionId}`;
+        this.loadCadInvoices();
+      },
+      error: (err) => {
+        this.creating = false;
+        this.errorMessage =
+          err?.error?.message || 'Creazione fattura CAD non riuscita.';
+      },
+    });
+  }
+
+  openCheckout(path: string): void {
+    const url = this.toCheckoutUrl(path);
+    window.open(url, '_blank');
+  }
+
+  copyCheckout(path: string): void {
+    const url = this.toCheckoutUrl(path);
+    navigator.clipboard?.writeText(url);
+    this.successMessage = 'Link checkout CAD copiato negli appunti.';
+  }
+
+  downloadInvoice(orderId?: string): void {
+    if (!orderId) return;
+    this.adminOrdersService.downloadOrderInvoice(orderId).subscribe({
+      next: (blob) => {
+        const url = window.URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = `fattura-cad-${orderId}.pdf`;
+        a.click();
+        window.URL.revokeObjectURL(url);
+      },
+      error: () => {
+        this.errorMessage = 'Download fattura non riuscito.';
+      },
+    });
+  }
+
+  private toCheckoutUrl(path: string): string {
+    const safePath = path.startsWith('/') ? path : `/${path}`;
+    const lang = this.resolveLang();
+    return `${window.location.origin}/${lang}${safePath}`;
+  }
+
+  private resolveLang(): string {
+    const firstSegment = window.location.pathname
+      .split('/')
+      .filter(Boolean)
+      .shift();
+    if (firstSegment && ['it', 'en', 'de', 'fr'].includes(firstSegment)) {
+      return firstSegment;
+    }
+    return 'it';
+  }
+}

frontend/src/app/features/admin/pages/admin-contact-requests.component.html

@@ -76,7 +76,12 @@
         <div>
           <h3>Dettaglio richiesta</h3>
           <p class="request-id">
-            <span>ID</span><code>{{ selectedRequest.id }}</code>
+            <span>ID</span>
+            <code
+              [title]="selectedRequest.id"
+              [appCopyOnClick]="selectedRequest.id"
+              >{{ selectedRequest.id }}</code
+            >
           </p>
         </div>
         <div class="detail-chips">

frontend/src/app/features/admin/pages/admin-contact-requests.component.scss

@@ -199,18 +199,20 @@ tbody tr.selected {
 .request-id {
   margin: var(--space-2) 0 0;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
+  flex-wrap: wrap;
   gap: 8px;
   font-size: 0.8rem;
   color: var(--color-text-muted);
 }
 
 .request-id code {
-  display: inline-block;
-  max-width: 260px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  display: block;
+  max-width: 100%;
+  overflow: visible;
+  text-overflow: clip;
+  white-space: normal;
+  overflow-wrap: anywhere;
   color: var(--color-text);
   background: var(--color-neutral-100);
   border: 1px solid var(--color-border);

frontend/src/app/features/admin/pages/admin-contact-requests.component.ts

@@ -7,11 +7,12 @@ import {
   AdminContactRequestDetail,
   AdminOperationsService,
 } from '../services/admin-operations.service';
+import { CopyOnClickDirective } from '../../../shared/directives/copy-on-click.directive';
 
 @Component({
   selector: 'app-admin-contact-requests',
   standalone: true,
-  imports: [CommonModule, FormsModule],
+  imports: [CommonModule, FormsModule, CopyOnClickDirective],
   templateUrl: './admin-contact-requests.component.html',
   styleUrl: './admin-contact-requests.component.scss',
 })

frontend/src/app/features/admin/pages/admin-dashboard.component.html

@@ -97,7 +97,12 @@
       <div class="detail-header">
         <h2>Dettaglio ordine {{ selectedOrder.orderNumber }}</h2>
         <p class="order-uuid">
-          UUID: <code>{{ selectedOrder.id }}</code>
+          UUID:
+          <code
+            [title]="selectedOrder.id"
+            [appCopyOnClick]="selectedOrder.id"
+            >{{ selectedOrder.id }}</code
+          >
         </p>
         <p *ngIf="detailLoading">Caricamento dettaglio...</p>
       </div>
@@ -158,12 +163,12 @@
           </select>
           <button
             type="button"
-            (click)="confirmPayment()"
-            [disabled]="
-              confirmingPayment || selectedOrder.paymentStatus === 'COMPLETED'
-            "
+            (click)="updatePaymentMethod()"
+            [disabled]="confirmingPayment"
           >
-            {{ confirmingPayment ? "Invio..." : "Conferma pagamento" }}
+            {{
+              confirmingPayment ? "Salvataggio..." : "Cambia metodo pagamento"
+            }}
           </button>
         </div>
       </div>
@@ -187,13 +192,18 @@
               <strong>{{ item.originalFilename }}</strong>
             </p>
             <p class="item-meta">
-              Qta: {{ item.quantity }} | Colore:
+              Qta: {{ item.quantity }} | Materiale:
+              {{ item.materialCode || "-" }} | Colore:
               <span
                 class="color-swatch"
                 *ngIf="isHexColor(item.colorCode)"
                 [style.background-color]="item.colorCode"
               ></span>
               <span>{{ item.colorCode || "-" }}</span>
+              | Nozzle: {{ item.nozzleDiameterMm ?? "-" }} mm | Layer:
+              {{ item.layerHeightMm ?? "-" }} mm | Infill:
+              {{ item.infillPercent ?? "-" }}% | Supporti:
+              {{ item.supportsEnabled ? "Sì" : "No" }}
               | Riga:
               {{ item.lineTotalChf | currency: "CHF" : "symbol" : "1.2-2" }}
             </p>
@@ -268,17 +278,15 @@
       </div>
     </div>
 
-    <h4>Colori file</h4>
+    <h4>Parametri per file</h4>
     <div class="file-color-list">
       <div class="file-color-row" *ngFor="let item of selectedOrder.items">
         <span class="filename">{{ item.originalFilename }}</span>
         <span class="file-color">
-          <span
-            class="color-swatch"
-            *ngIf="isHexColor(item.colorCode)"
-            [style.background-color]="item.colorCode"
-          ></span>
-          {{ item.colorCode || "-" }}
+          {{ item.materialCode || "-" }} | {{ item.nozzleDiameterMm ?? "-" }} mm
+          | {{ item.layerHeightMm ?? "-" }} mm | {{ item.infillPercent ?? "-" }}%
+          | {{ item.infillPattern || "-" }} |
+          {{ item.supportsEnabled ? "Supporti ON" : "Supporti OFF" }}
         </span>
       </div>
     </div>

frontend/src/app/features/admin/pages/admin-dashboard.component.ts

@@ -5,11 +5,12 @@ import {
   AdminOrder,
   AdminOrdersService,
 } from '../services/admin-orders.service';
+import { CopyOnClickDirective } from '../../../shared/directives/copy-on-click.directive';
 
 @Component({
   selector: 'app-admin-dashboard',
   standalone: true,
-  imports: [CommonModule, FormsModule],
+  imports: [CommonModule, FormsModule, CopyOnClickDirective],
   templateUrl: './admin-dashboard.component.html',
   styleUrl: './admin-dashboard.component.scss',
 })
@@ -131,14 +132,14 @@ export class AdminDashboardComponent implements OnInit {
     });
   }
 
-  confirmPayment(): void {
+  updatePaymentMethod(): void {
     if (!this.selectedOrder || this.confirmingPayment) {
       return;
     }
 
     this.confirmingPayment = true;
     this.adminOrdersService
-      .confirmPayment(this.selectedOrder.id, this.selectedPaymentMethod)
+      .updatePaymentMethod(this.selectedOrder.id, this.selectedPaymentMethod)
       .subscribe({
         next: (updatedOrder) => {
           this.confirmingPayment = false;
@@ -146,7 +147,7 @@ export class AdminDashboardComponent implements OnInit {
         },
         error: () => {
           this.confirmingPayment = false;
-          this.errorMessage = 'Conferma pagamento non riuscita.';
+          this.errorMessage = 'Aggiornamento metodo pagamento non riuscito.';
         },
       });
   }

frontend/src/app/features/admin/pages/admin-sessions.component.html

@@ -33,12 +33,23 @@
       <tbody>
         <ng-container *ngFor="let session of sessions">
           <tr>
-            <td [title]="session.id">{{ session.id | slice: 0 : 8 }}</td>
+            <td [title]="session.id" [appCopyOnClick]="session.id">
+              {{ session.id | slice: 0 : 8 }}
+            </td>
             <td>{{ session.createdAt | date: "short" }}</td>
             <td>{{ session.expiresAt | date: "short" }}</td>
             <td>{{ session.materialCode }}</td>
             <td>{{ session.status }}</td>
-            <td>{{ session.convertedOrderId || "-" }}</td>
+            <td
+              [title]="session.convertedOrderId || ''"
+              [appCopyOnClick]="session.convertedOrderId"
+            >
+              {{
+                session.convertedOrderId
+                  ? (session.convertedOrderId | slice: 0 : 8)
+                  : "-"
+              }}
+            </td>
             <td class="actions">
               <button
                 type="button"
@@ -78,6 +89,15 @@
                 "
                 class="detail-box"
               >
+                <div class="detail-session-id">
+                  <strong>UUID sessione:</strong>
+                  <code
+                    [title]="detail.session.id"
+                    [appCopyOnClick]="detail.session.id"
+                    >{{ detail.session.id }}</code
+                  >
+                </div>
+
                 <div class="detail-summary">
                   <div>
                     <strong>Elementi:</strong> {{ detail.items.length }}
@@ -106,6 +126,7 @@
                       <th>Qta</th>
                       <th>Tempo</th>
                       <th>Materiale</th>
+                      <th>Scelte utente</th>
                       <th>Stato</th>
                       <th>Prezzo unit.</th>
                     </tr>
@@ -122,6 +143,14 @@
                             : "-"
                         }}
                       </td>
+                      <td>
+                        {{ item.materialCode || "-" }} |
+                        {{ item.nozzleDiameterMm ?? "-" }} mm |
+                        {{ item.layerHeightMm ?? "-" }} mm |
+                        {{ item.infillPercent ?? "-" }}% |
+                        {{ item.infillPattern || "-" }} |
+                        {{ item.supportsEnabled ? "Supporti ON" : "Supporti OFF" }}
+                      </td>
                       <td>{{ item.status }}</td>
                       <td>{{ item.unitPriceChf | currency: "CHF" }}</td>
                     </tr>

frontend/src/app/features/admin/pages/admin-sessions.component.scss

@@ -103,6 +103,22 @@ td {
   padding: var(--space-4);
 }
 
+.detail-session-id {
+  margin-bottom: var(--space-3);
+  display: grid;
+  gap: 4px;
+}
+
+.detail-session-id code {
+  display: block;
+  max-width: 100%;
+  padding: var(--space-2);
+  border-radius: var(--radius-sm);
+  border: 1px solid var(--color-border);
+  background: var(--color-neutral-100);
+  overflow-wrap: anywhere;
+}
+
 .detail-summary {
   display: flex;
   flex-wrap: wrap;

frontend/src/app/features/admin/pages/admin-sessions.component.ts

@@ -5,11 +5,12 @@ import {
   AdminQuoteSession,
   AdminQuoteSessionDetail,
 } from '../services/admin-operations.service';
+import { CopyOnClickDirective } from '../../../shared/directives/copy-on-click.directive';
 
 @Component({
   selector: 'app-admin-sessions',
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, CopyOnClickDirective],
   templateUrl: './admin-sessions.component.html',
   styleUrl: './admin-sessions.component.scss',
 })

frontend/src/app/features/admin/pages/admin-shell.component.html

@@ -16,6 +16,7 @@
             >Richieste contatto</a
           >
           <a routerLink="sessions" routerLinkActive="active">Sessioni</a>
+          <a routerLink="cad-invoices" routerLinkActive="active">Fatture CAD</a>
         </nav>
       </div>
 

frontend/src/app/features/admin/services/admin-operations.service.ts

@@ -115,6 +115,10 @@ export interface AdminQuoteSession {
   createdAt: string;
   expiresAt: string;
   convertedOrderId?: string;
+  sourceRequestId?: string;
+  cadHours?: number;
+  cadHourlyRateChf?: number;
+  cadTotalChf?: number;
 }
 
 export interface AdminQuoteSessionDetailItem {
@@ -123,7 +127,15 @@ export interface AdminQuoteSessionDetailItem {
   quantity: number;
   printTimeSeconds?: number;
   materialGrams?: number;
+  materialCode?: string;
+  quality?: string;
+  nozzleDiameterMm?: number;
+  layerHeightMm?: number;
+  infillPercent?: number;
+  infillPattern?: string;
+  supportsEnabled?: boolean;
   colorCode?: string;
+  filamentVariantId?: number;
   status: string;
   unitPriceChf: number;
 }
@@ -136,14 +148,45 @@ export interface AdminQuoteSessionDetail {
     setupCostChf?: number;
     supportsEnabled?: boolean;
     notes?: string;
+    sourceRequestId?: string;
+    cadHours?: number;
+    cadHourlyRateChf?: number;
   };
   items: AdminQuoteSessionDetailItem[];
+  printItemsTotalChf: number;
+  cadTotalChf: number;
   itemsTotalChf: number;
   shippingCostChf: number;
   globalMachineCostChf: number;
   grandTotalChf: number;
 }
 
+export interface AdminCreateCadInvoicePayload {
+  sessionId?: string;
+  sourceRequestId?: string;
+  cadHours: number;
+  cadHourlyRateChf?: number;
+  notes?: string;
+}
+
+export interface AdminCadInvoice {
+  sessionId: string;
+  sessionStatus: string;
+  sourceRequestId?: string;
+  cadHours: number;
+  cadHourlyRateChf: number;
+  cadTotalChf: number;
+  printItemsTotalChf: number;
+  setupCostChf: number;
+  shippingCostChf: number;
+  grandTotalChf: number;
+  convertedOrderId?: string;
+  convertedOrderStatus?: string;
+  checkoutPath: string;
+  notes?: string;
+  createdAt: string;
+}
+
 @Injectable({
   providedIn: 'root',
 })
@@ -279,4 +322,20 @@ export class AdminOperationsService {
       { withCredentials: true },
     );
   }
+
+  listCadInvoices(): Observable<AdminCadInvoice[]> {
+    return this.http.get<AdminCadInvoice[]>(`${this.baseUrl}/cad-invoices`, {
+      withCredentials: true,
+    });
+  }
+
+  createCadInvoice(
+    payload: AdminCreateCadInvoicePayload,
+  ): Observable<AdminCadInvoice> {
+    return this.http.post<AdminCadInvoice>(
+      `${this.baseUrl}/cad-invoices`,
+      payload,
+      { withCredentials: true },
+    );
+  }
 }

frontend/src/app/features/admin/services/admin-orders.service.ts

@@ -8,6 +8,12 @@ export interface AdminOrderItem {
   originalFilename: string;
   materialCode: string;
   colorCode: string;
+  quality?: string;
+  nozzleDiameterMm?: number;
+  layerHeightMm?: number;
+  infillPercent?: number;
+  infillPattern?: string;
+  supportsEnabled?: boolean;
   quantity: number;
   printTimeSeconds: number;
   materialGrams: number;
@@ -24,6 +30,11 @@ export interface AdminOrder {
   customerEmail: string;
   totalChf: number;
   createdAt: string;
+  isCadOrder?: boolean;
+  sourceRequestId?: string;
+  cadHours?: number;
+  cadHourlyRateChf?: number;
+  cadTotalChf?: number;
   printMaterialCode?: string;
   printNozzleDiameterMm?: number;
   printLayerHeightMm?: number;
@@ -54,7 +65,7 @@ export class AdminOrdersService {
     });
   }
 
-  confirmPayment(orderId: string, method: string): Observable<AdminOrder> {
+  updatePaymentMethod(orderId: string, method: string): Observable<AdminOrder> {
     return this.http.post<AdminOrder>(
       `${this.baseUrl}/${orderId}/payments/confirm`,
       { method },

frontend/src/app/features/calculator/calculator-page.component.html

@@ -23,14 +23,16 @@
           <div
             class="mode-option"
             [class.active]="mode() === 'easy'"
-            (click)="mode.set('easy')"
+            [class.disabled]="cadSessionLocked()"
+            (click)="switchMode('easy')"
           >
             {{ "CALC.MODE_EASY" | translate }}
           </div>
           <div
             class="mode-option"
             [class.active]="mode() === 'advanced'"
-            (click)="mode.set('advanced')"
+            [class.disabled]="cadSessionLocked()"
+            (click)="switchMode('advanced')"
           >
             {{ "CALC.MODE_ADVANCED" | translate }}
           </div>
@@ -39,9 +41,13 @@
         <app-upload-form
           #uploadForm
           [mode]="mode()"
+          [lockedSettings]="cadSessionLocked()"
           [loading]="loading()"
           [uploadProgress]="uploadProgress()"
           (submitRequest)="onCalculate($event)"
+          (itemQuantityChange)="onUploadItemQuantityChange($event)"
+          (printSettingsChange)="onUploadPrintSettingsChange($event)"
+          (itemSettingsDiffChange)="onItemSettingsDiffChange($event)"
         ></app-upload-form>
       </app-card>
     </div>
@@ -61,10 +67,23 @@
       } @else if (result()) {
         <app-quote-result
           [result]="result()!"
+          [recalculationRequired]="requiresRecalculation()"
+          [itemSettingsDiffByFileName]="itemSettingsDiffByFileName()"
           (consult)="onConsult()"
           (proceed)="onProceed()"
+          (itemQuantityPreviewChange)="onQuoteItemQuantityPreviewChange($event)"
           (itemChange)="onItemChange($event)"
         ></app-quote-result>
+      } @else if (isZeroQuoteError()) {
+        <app-card class="zero-result-card">
+          <h3>{{ "CALC.ZERO_RESULT_TITLE" | translate }}</h3>
+          <p>{{ "CALC.ZERO_RESULT_HELP" | translate }}</p>
+          <div class="zero-result-action">
+            <app-button variant="outline" (click)="onConsult()">
+              {{ "QUOTE.CONSULT" | translate }}
+            </app-button>
+          </div>
+        </app-card>
       } @else {
         <app-card>
           <h3>{{ "CALC.BENEFITS_TITLE" | translate }}</h3>

frontend/src/app/features/calculator/calculator-page.component.scss

@@ -9,6 +9,12 @@
   margin: 0 auto;
 }
 
+.error-action {
+  display: flex;
+  justify-content: center;
+  margin-top: calc(var(--space-4) * -1);
+}
+
 .content-grid {
   display: grid;
   grid-template-columns: 1fr;
@@ -74,6 +80,11 @@
     font-weight: 600;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
   }
+
+  &.disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
 }
 
 .benefits {
@@ -82,6 +93,15 @@
   line-height: 2;
 }
 
+.zero-result-card p {
+  color: var(--color-text-muted);
+  line-height: 1.6;
+}
+
+.zero-result-action {
+  margin-top: var(--space-4);
+}
+
 .loader-content {
   text-align: center;
   max-width: 300px;

frontend/src/app/features/calculator/calculator-page.component.ts

@@ -1,5 +1,6 @@
 import {
   Component,
+  computed,
   signal,
   ViewChild,
   ElementRef,
@@ -7,11 +8,12 @@ import {
 } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import { forkJoin } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { forkJoin, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 
 import { AppCardComponent } from '../../shared/components/app-card/app-card.component';
 import { AppAlertComponent } from '../../shared/components/app-alert/app-alert.component';
+import { AppButtonComponent } from '../../shared/components/app-button/app-button.component';
 import { UploadFormComponent } from './components/upload-form/upload-form.component';
 import { QuoteResultComponent } from './components/quote-result/quote-result.component';
 import {
@@ -23,6 +25,17 @@ import { SuccessStateComponent } from '../../shared/components/success-state/suc
 import { Router, ActivatedRoute } from '@angular/router';
 import { LanguageService } from '../../core/services/language.service';
 
+type TrackedPrintSettings = {
+  mode: 'easy' | 'advanced';
+  material: string;
+  quality: string;
+  nozzleDiameter: number;
+  layerHeight: number;
+  infillDensity: number;
+  infillPattern: string;
+  supportEnabled: boolean;
+};
+
 @Component({
   selector: 'app-calculator-page',
   standalone: true,
@@ -31,6 +44,7 @@ import { LanguageService } from '../../core/services/language.service';
     TranslateModule,
     AppCardComponent,
     AppAlertComponent,
+    AppButtonComponent,
     UploadFormComponent,
     QuoteResultComponent,
     SuccessStateComponent,
@@ -39,16 +53,26 @@ import { LanguageService } from '../../core/services/language.service';
   styleUrl: './calculator-page.component.scss',
 })
 export class CalculatorPageComponent implements OnInit {
-  mode = signal<any>('easy');
+  mode = signal<'easy' | 'advanced'>('easy');
   step = signal<'upload' | 'quote' | 'details' | 'success'>('upload');
 
   loading = signal(false);
   uploadProgress = signal(0);
   result = signal<QuoteResult | null>(null);
+  cadSessionLocked = signal(false);
   error = signal<boolean>(false);
   errorKey = signal<string>('CALC.ERROR_GENERIC');
+  isZeroQuoteError = computed(
+    () => this.error() && this.errorKey() === 'CALC.ERROR_ZERO_PRICE',
+  );
 
   orderSuccess = signal(false);
+  requiresRecalculation = signal(false);
+  itemSettingsDiffByFileName = signal<
+    Record<string, { differences: string[] }>
+  >({});
+  private baselinePrintSettings: TrackedPrintSettings | null = null;
+  private baselineItemSettingsByFileName = new Map<string, TrackedPrintSettings>();
 
   @ViewChild('uploadForm') uploadForm!: UploadFormComponent;
   @ViewChild('resultCol') resultCol!: ElementRef;
@@ -94,6 +118,17 @@ export class CalculatorPageComponent implements OnInit {
         this.error.set(false);
         this.errorKey.set('CALC.ERROR_GENERIC');
         this.result.set(result);
+        this.baselinePrintSettings = this.toTrackedSettingsFromSession(
+          data.session,
+        );
+        this.baselineItemSettingsByFileName = this.buildBaselineMapFromSession(
+          data.items || [],
+          this.baselinePrintSettings,
+        );
+        this.requiresRecalculation.set(false);
+        this.itemSettingsDiffByFileName.set({});
+        const isCadSession = data?.session?.status === 'CAD_ACTIVE';
+        this.cadSessionLocked.set(isCadSession);
         this.step.set('quote');
 
         // 2. Determine Mode (Heuristic)
@@ -122,15 +157,18 @@ export class CalculatorPageComponent implements OnInit {
 
     // Download all files
     const downloads = items.map((item) =>
-      this.estimator.getLineItemContent(session.id, item.id).pipe(
-        map((blob: Blob) => {
+      forkJoin({
+        originalBlob: this.estimator.getLineItemContent(session.id, item.id),
+        previewBlob: this.estimator
+          .getLineItemContent(session.id, item.id, true)
+          .pipe(catchError(() => of(null))),
+      }).pipe(
+        map(({ originalBlob, previewBlob }) => {
           return {
-            blob,
+            originalBlob,
+            previewBlob,
             fileName: item.originalFilename,
-            // We need to match the file object to the item so we can set colors ideally.
-            // UploadForm.setFiles takes File[].
-            // We might need to handle matching but UploadForm just pushes them.
-            // If order is preserved, we are good. items from backend are list.
+            hasConvertedPreview: !!item.convertedStoredPath,
           };
         }),
       ),
@@ -140,32 +178,54 @@ export class CalculatorPageComponent implements OnInit {
       next: (results: any[]) => {
         const files = results.map(
           (res) =>
-            new File([res.blob], res.fileName, {
+            new File([res.originalBlob], res.fileName, {
               type: 'application/octet-stream',
             }),
         );
 
         if (this.uploadForm) {
           this.uploadForm.setFiles(files);
+          results.forEach((res, index) => {
+            if (!res.hasConvertedPreview || !res.previewBlob) {
+              return;
+            }
+            const previewName = res.fileName
+              .replace(/\.[^.]+$/, '')
+              .concat('.stl');
+            const previewFile = new File([res.previewBlob], previewName, {
+              type: 'model/stl',
+            });
+            this.uploadForm.setPreviewFileByIndex(index, previewFile);
+          });
           this.uploadForm.patchSettings(session);
 
-          // Also restore colors?
-          // setFiles inits with 'Black'. We need to update them if they differ.
-          // items has colorCode.
-          setTimeout(() => {
-            if (this.uploadForm) {
-              items.forEach((item, index) => {
-                // Assuming index matches.
-                // Need to be careful if items order changed, but usually ID sort or insert order.
-                if (item.colorCode) {
-                  this.uploadForm.updateItemColor(index, {
-                    colorName: item.colorCode,
-                    filamentVariantId: item.filamentVariantId,
-                  });
-                }
+          items.forEach((item, index) => {
+            const tracked = this.toTrackedSettingsFromSessionItem(
+              item,
+              this.toTrackedSettingsFromSession(session),
+            );
+            this.uploadForm.setItemPrintSettingsByIndex(index, {
+              material: tracked.material.toUpperCase(),
+              quality: tracked.quality,
+              nozzleDiameter: tracked.nozzleDiameter,
+              layerHeight: tracked.layerHeight,
+              infillDensity: tracked.infillDensity,
+              infillPattern: tracked.infillPattern,
+              supportEnabled: tracked.supportEnabled,
+            });
+
+            if (item.colorCode) {
+              this.uploadForm.updateItemColor(index, {
+                colorName: item.colorCode,
+                filamentVariantId: item.filamentVariantId,
               });
             }
           });
+
+          const selected = this.uploadForm.selectedFile();
+          if (selected) {
+            this.uploadForm.selectFile(selected);
+          }
         }
         this.loading.set(false);
       },
@@ -185,6 +245,7 @@ export class CalculatorPageComponent implements OnInit {
     this.error.set(false);
     this.errorKey.set('CALC.ERROR_GENERIC');
     this.result.set(null);
+    this.cadSessionLocked.set(false);
     this.orderSuccess.set(false);
 
     // Auto-scroll on mobile to make analysis visible
@@ -213,6 +274,11 @@ export class CalculatorPageComponent implements OnInit {
           this.error.set(false);
           this.errorKey.set('CALC.ERROR_GENERIC');
           this.result.set(res);
+          this.baselinePrintSettings = this.toTrackedSettingsFromRequest(req);
+          this.baselineItemSettingsByFileName =
+            this.buildBaselineMapFromRequest(req);
+          this.requiresRecalculation.set(false);
+          this.itemSettingsDiffByFileName.set({});
           this.loading.set(false);
           this.uploadProgress.set(100);
           this.step.set('quote');
@@ -225,6 +291,17 @@ export class CalculatorPageComponent implements OnInit {
               queryParamsHandling: 'merge', // merge with existing params like 'mode' if any
               replaceUrl: true, // prevent cluttering history, or false if we want back button to work. replaceUrl seems safer for "state update"
             });
+            this.estimator.getQuoteSession(res.sessionId).subscribe({
+              next: (sessionData) => {
+                this.restoreFilesAndSettings(
+                  sessionData.session,
+                  sessionData.items || [],
+                );
+              },
+              error: (err) => {
+                console.warn('Failed to refresh files for preview', err);
+              },
+            });
           }
         }
       },
@@ -238,10 +315,12 @@ export class CalculatorPageComponent implements OnInit {
   onProceed() {
     const res = this.result();
     if (res && res.sessionId) {
-      this.router.navigate(
-        ['/', this.languageService.selectedLang(), 'checkout'],
-        { queryParams: { session: res.sessionId } },
-      );
+      const segments = this.cadSessionLocked()
+        ? ['/', this.languageService.selectedLang(), 'checkout', 'cad']
+        : ['/', this.languageService.selectedLang(), 'checkout'];
+      this.router.navigate(segments, {
+        queryParams: { session: res.sessionId },
+      });
     } else {
       console.error('No session ID found in quote result');
       // Fallback or error handling
@@ -257,9 +336,10 @@ export class CalculatorPageComponent implements OnInit {
     index: number;
     fileName: string;
     quantity: number;
+    source?: 'left' | 'right';
   }) {
     // 1. Update local form for consistency (UI feedback)
-    if (this.uploadForm) {
+    if (event.source !== 'left' && this.uploadForm) {
       this.uploadForm.updateItemQuantityByIndex(event.index, event.quantity);
       this.uploadForm.updateItemQuantityByName(event.fileName, event.quantity);
     }
@@ -302,6 +382,33 @@ export class CalculatorPageComponent implements OnInit {
     }
   }
 
+  onUploadItemQuantityChange(event: {
+    index: number;
+    fileName: string;
+    quantity: number;
+  }) {
+    const resultItems = this.result()?.items || [];
+    const byIndex = resultItems[event.index];
+    const byName = resultItems.find((item) => item.fileName === event.fileName);
+    const id = byIndex?.id ?? byName?.id;
+
+    this.onItemChange({
+      ...event,
+      id,
+      source: 'left',
+    });
+  }
+
+  onQuoteItemQuantityPreviewChange(event: {
+    index: number;
+    fileName: string;
+    quantity: number;
+  }) {
+    if (!this.uploadForm) return;
+    this.uploadForm.updateItemQuantityByIndex(event.index, event.quantity);
+    this.uploadForm.updateItemQuantityByName(event.fileName, event.quantity);
+  }
+
   onSubmitOrder(orderData: any) {
     console.log('Order Submitted:', orderData);
     this.orderSuccess.set(true);
@@ -311,16 +418,45 @@ export class CalculatorPageComponent implements OnInit {
   onNewQuote() {
     this.step.set('upload');
     this.result.set(null);
+    this.requiresRecalculation.set(false);
+    this.itemSettingsDiffByFileName.set({});
+    this.baselinePrintSettings = null;
+    this.baselineItemSettingsByFileName = new Map<
+      string,
+      TrackedPrintSettings
+    >();
+    this.cadSessionLocked.set(false);
     this.orderSuccess.set(false);
-    this.mode.set('easy'); // Reset to default
+    this.switchMode('easy'); // Reset to default and sync URL
   }
 
   private currentRequest: QuoteRequest | null = null;
 
-  onConsult() {
-    if (!this.currentRequest) return;
+  onUploadPrintSettingsChange(_: TrackedPrintSettings) {
+    void _;
+    if (!this.result()) return;
+    this.refreshRecalculationRequirement();
+  }
+
+  onItemSettingsDiffChange(
+    diffByFileName: Record<string, { differences: string[] }>,
+  ) {
+    this.itemSettingsDiffByFileName.set(diffByFileName || {});
+  }
+
+  onConsult() {
+    const currentFormRequest = this.uploadForm?.getCurrentRequestDraft();
+    const req = currentFormRequest ?? this.currentRequest;
+
+    if (!req) {
+      this.router.navigate([
+        '/',
+        this.languageService.selectedLang(),
+        'contact',
+      ]);
+      return;
+    }
 
-    const req = this.currentRequest;
     let details = `Richiesta Preventivo:\n`;
     details += `- Materiale: ${req.material}\n`;
     details += `- Qualità: ${req.quality}\n`;
@@ -349,12 +485,247 @@ export class CalculatorPageComponent implements OnInit {
   }
 
   private isInvalidQuote(result: QuoteResult): boolean {
-    return !Number.isFinite(result.totalPrice) || result.totalPrice <= 0;
+    const invalidPrice =
+      !Number.isFinite(result.totalPrice) || result.totalPrice <= 0;
+    const invalidWeight =
+      !Number.isFinite(result.totalWeight) || result.totalWeight <= 0;
+    const invalidTime =
+      !Number.isFinite(result.totalTimeHours) ||
+      !Number.isFinite(result.totalTimeMinutes) ||
+      (result.totalTimeHours <= 0 && result.totalTimeMinutes <= 0);
+
+    return invalidPrice || invalidWeight || invalidTime;
   }
 
   private setQuoteError(key: string): void {
     this.errorKey.set(key);
     this.error.set(true);
     this.result.set(null);
+    this.requiresRecalculation.set(false);
+    this.itemSettingsDiffByFileName.set({});
+    this.baselinePrintSettings = null;
+    this.baselineItemSettingsByFileName = new Map<
+      string,
+      TrackedPrintSettings
+    >();
+  }
+
+  switchMode(nextMode: 'easy' | 'advanced'): void {
+    if (this.cadSessionLocked()) return;
+
+    const targetPath = nextMode === 'easy' ? 'basic' : 'advanced';
+    const currentPath = this.route.snapshot.routeConfig?.path;
+
+    this.mode.set(nextMode);
+
+    if (currentPath === targetPath) {
+      return;
+    }
+
+    this.router.navigate(['..', targetPath], {
+      relativeTo: this.route,
+      queryParamsHandling: 'preserve',
+    });
+  }
+
+  private toTrackedSettingsFromRequest(req: QuoteRequest): TrackedPrintSettings {
+    return {
+      mode: req.mode,
+      material: this.normalizeString(req.material || 'PLA'),
+      quality: this.normalizeString(req.quality || 'standard'),
+      nozzleDiameter: this.normalizeNumber(req.nozzleDiameter, 0.4, 2),
+      layerHeight: this.normalizeNumber(req.layerHeight, 0.2, 3),
+      infillDensity: this.normalizeNumber(req.infillDensity, 20, 2),
+      infillPattern: this.normalizeString(req.infillPattern || 'grid'),
+      supportEnabled: Boolean(req.supportEnabled),
+    };
+  }
+
+  private toTrackedSettingsFromItem(
+    req: QuoteRequest,
+    item: QuoteRequest['items'][number],
+  ): TrackedPrintSettings {
+    return {
+      mode: req.mode,
+      material: this.normalizeString(item.material || req.material || 'PLA'),
+      quality: this.normalizeString(item.quality || req.quality || 'standard'),
+      nozzleDiameter: this.normalizeNumber(
+        item.nozzleDiameter ?? req.nozzleDiameter,
+        0.4,
+        2,
+      ),
+      layerHeight: this.normalizeNumber(
+        item.layerHeight ?? req.layerHeight,
+        0.2,
+        3,
+      ),
+      infillDensity: this.normalizeNumber(
+        item.infillDensity ?? req.infillDensity,
+        20,
+        2,
+      ),
+      infillPattern: this.normalizeString(
+        item.infillPattern || req.infillPattern || 'grid',
+      ),
+      supportEnabled: Boolean(item.supportEnabled ?? req.supportEnabled),
+    };
+  }
+
+  private toTrackedSettingsFromSession(session: any): TrackedPrintSettings {
+    const layer = this.normalizeNumber(session?.layerHeightMm, 0.2, 3);
+    return {
+      mode: this.mode(),
+      material: this.normalizeString(session?.materialCode || 'PLA'),
+      quality:
+        layer >= 0.24 ? 'draft' : layer <= 0.12 ? 'extra_fine' : 'standard',
+      nozzleDiameter: this.normalizeNumber(session?.nozzleDiameterMm, 0.4, 2),
+      layerHeight: layer,
+      infillDensity: this.normalizeNumber(session?.infillPercent, 20, 2),
+      infillPattern: this.normalizeString(session?.infillPattern || 'grid'),
+      supportEnabled: Boolean(session?.supportsEnabled),
+    };
+  }
+
+  private toTrackedSettingsFromSessionItem(
+    item: any,
+    fallback: TrackedPrintSettings,
+  ): TrackedPrintSettings {
+    const layer = this.normalizeNumber(item?.layerHeightMm, fallback.layerHeight, 3);
+    return {
+      mode: this.mode(),
+      material: this.normalizeString(item?.materialCode || fallback.material),
+      quality: this.normalizeString(
+        item?.quality ||
+          (layer >= 0.24
+            ? 'draft'
+            : layer <= 0.12
+              ? 'extra_fine'
+              : 'standard'),
+      ),
+      nozzleDiameter: this.normalizeNumber(
+        item?.nozzleDiameterMm,
+        fallback.nozzleDiameter,
+        2,
+      ),
+      layerHeight: layer,
+      infillDensity: this.normalizeNumber(
+        item?.infillPercent,
+        fallback.infillDensity,
+        2,
+      ),
+      infillPattern: this.normalizeString(
+        item?.infillPattern || fallback.infillPattern,
+      ),
+      supportEnabled: Boolean(
+        item?.supportsEnabled ?? fallback.supportEnabled,
+      ),
+    };
+  }
+
+  private buildBaselineMapFromRequest(
+    req: QuoteRequest,
+  ): Map<string, TrackedPrintSettings> {
+    const map = new Map<string, TrackedPrintSettings>();
+    req.items.forEach((item) => {
+      map.set(
+        this.normalizeFileName(item.file?.name || ''),
+        this.toTrackedSettingsFromItem(req, item),
+      );
+    });
+    return map;
+  }
+
+  private buildBaselineMapFromSession(
+    items: any[],
+    defaultSettings: TrackedPrintSettings | null,
+  ): Map<string, TrackedPrintSettings> {
+    const map = new Map<string, TrackedPrintSettings>();
+    const fallback = defaultSettings ?? this.defaultTrackedSettings();
+    items.forEach((item) => {
+      map.set(
+        this.normalizeFileName(item?.originalFilename || ''),
+        this.toTrackedSettingsFromSessionItem(item, fallback),
+      );
+    });
+    return map;
+  }
+
+  private defaultTrackedSettings(): TrackedPrintSettings {
+    return {
+      mode: this.mode(),
+      material: 'pla',
+      quality: 'standard',
+      nozzleDiameter: 0.4,
+      layerHeight: 0.2,
+      infillDensity: 20,
+      infillPattern: 'grid',
+      supportEnabled: false,
+    };
+  }
+
+  private refreshRecalculationRequirement(): void {
+    if (!this.result()) return;
+
+    const draft = this.uploadForm?.getCurrentRequestDraft();
+    if (!draft || draft.items.length === 0) {
+      this.requiresRecalculation.set(false);
+      return;
+    }
+
+    const fallback = this.baselinePrintSettings;
+    if (!fallback) {
+      this.requiresRecalculation.set(false);
+      return;
+    }
+
+    const changed = draft.items.some((item) => {
+      const key = this.normalizeFileName(item.file?.name || '');
+      const baseline = this.baselineItemSettingsByFileName.get(key) || fallback;
+      const current = this.toTrackedSettingsFromItem(draft, item);
+      return !this.sameTrackedSettings(baseline, current);
+    });
+
+    this.requiresRecalculation.set(changed);
+  }
+
+  private sameTrackedSettings(
+    a: TrackedPrintSettings,
+    b: TrackedPrintSettings,
+  ): boolean {
+    return (
+      a.mode === b.mode &&
+      a.material === this.normalizeString(b.material) &&
+      a.quality === this.normalizeString(b.quality) &&
+      Math.abs(
+        a.nozzleDiameter - this.normalizeNumber(b.nozzleDiameter, 0.4, 2),
+      ) < 0.0001 &&
+      Math.abs(a.layerHeight - this.normalizeNumber(b.layerHeight, 0.2, 3)) <
+        0.0001 &&
+      Math.abs(a.infillDensity - this.normalizeNumber(b.infillDensity, 20, 2)) <
+        0.0001 &&
+      a.infillPattern === this.normalizeString(b.infillPattern) &&
+      a.supportEnabled === Boolean(b.supportEnabled)
+    );
+  }
+
+  private normalizeFileName(fileName: string): string {
+    return (fileName || '').split(/[\\/]/).pop()?.trim().toLowerCase() ?? '';
+  }
+
+  private normalizeString(value: string): string {
+    return String(value || '')
+      .trim()
+      .toLowerCase();
+  }
+
+  private normalizeNumber(
+    value: unknown,
+    fallback: number,
+    decimals: number,
+  ): number {
+    const numeric = Number(value);
+    const resolved = Number.isFinite(numeric) ? numeric : fallback;
+    const factor = 10 ** decimals;
+    return Math.round(resolved * factor) / factor;
   }
 }

frontend/src/app/features/calculator/calculator.routes.ts

@@ -3,10 +3,24 @@ import { CalculatorPageComponent } from './calculator-page.component';
 
 export const CALCULATOR_ROUTES: Routes = [
   { path: '', redirectTo: 'basic', pathMatch: 'full' },
-  { path: 'basic', component: CalculatorPageComponent, data: { mode: 'easy' } },
+  {
+    path: 'basic',
+    component: CalculatorPageComponent,
+    data: {
+      mode: 'easy',
+      seoTitle: 'Calcolatore stampa 3D base | 3D fab',
+      seoDescription:
+        'Calcola rapidamente il prezzo della tua stampa 3D in modalita base.',
+    },
+  },
   {
     path: 'advanced',
     component: CalculatorPageComponent,
-    data: { mode: 'advanced' },
+    data: {
+      mode: 'advanced',
+      seoTitle: 'Calcolatore stampa 3D avanzato | 3D fab',
+      seoDescription:
+        'Configura parametri avanzati e ottieni un preventivo preciso con slicing reale.',
+    },
   },
 ];

frontend/src/app/features/calculator/components/quote-result/quote-result.component.html

@@ -28,6 +28,12 @@
           : { cost: (result().setupCost | currency: result().currency) }
     }}</small
     ><br />
+    @if ((result().cadTotal || 0) > 0) {
+      <small class="shipping-note" style="color: #666">
+        Servizio CAD: {{ result().cadTotal | currency: result().currency }}
+      </small>
+      <br />
+    }
     <small class="shipping-note" style="color: #666">{{
       "CALC.SHIPPING_NOTE" | translate
     }}</small>
@@ -39,6 +45,12 @@
       <p>{{ result().notes }}</p>
     </div>
   }
+  @if (recalculationRequired()) {
+    <div class="recalc-banner">
+      Hai modificato i parametri di stampa. Ricalcola il preventivo prima di
+      procedere con l'ordine.
+    </div>
+  }
 
   <div class="divider"></div>
 
@@ -50,7 +62,14 @@
           <span class="file-name">{{ item.fileName }}</span>
           <span class="file-details">
             {{ item.unitTime / 3600 | number: "1.1-1" }}h |
-            {{ item.unitWeight | number: "1.0-0" }}g
+            {{ item.unitWeight | number: "1.0-0" }}g |
+            <span class="material-chip">{{ item.material || "N/D" }}</span>
+            @if (getItemDifferenceLabel(item.fileName, item.material)) {
+              |
+              <small class="item-settings-diff">
+                {{ getItemDifferenceLabel(item.fileName, item.material) }}
+              </small>
+            }
           </span>
         </div>
 
@@ -90,18 +109,30 @@
   </div>
 
   <div class="actions">
-    <app-button variant="outline" (click)="consult.emit()">
-      {{ "QUOTE.CONSULT" | translate }}
-    </app-button>
-
-    @if (!hasQuantityOverLimit()) {
-      <app-button (click)="proceed.emit()">
-        {{ "QUOTE.PROCEED_ORDER" | translate }}
+    <div class="actions-left">
+      <app-button variant="secondary" (click)="consult.emit()">
+        {{ "QUOTE.CONSULT" | translate }}
       </app-button>
-    } @else {
-      <small class="limit-note">{{
-        "QUOTE.MAX_QTY_NOTICE" | translate: { max: directOrderLimit }
-      }}</small>
-    }
+    </div>
+
+    <div class="actions-right">
+      @if (!hasQuantityOverLimit()) {
+        <app-button
+          [disabled]="recalculationRequired()"
+          (click)="proceed.emit()"
+        >
+          {{ "QUOTE.PROCEED_ORDER" | translate }}
+        </app-button>
+      } @else {
+        <small class="limit-note">{{
+          "QUOTE.MAX_QTY_NOTICE" | translate: { max: directOrderLimit }
+        }}</small>
+      }
+      @if (recalculationRequired()) {
+        <small class="limit-note">
+          Ricalcola il preventivo per riattivare il checkout.
+        </small>
+      }
+    </div>
   </div>
 </app-card>

frontend/src/app/features/calculator/components/quote-result/quote-result.component.scss

@@ -20,10 +20,11 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: var(--space-3);
-  background: var(--color-neutral-50);
+  padding: var(--space-3) var(--space-4);
+  background: var(--color-bg-card);
   border-radius: var(--radius-md);
   border: 1px solid var(--color-border);
+  box-shadow: 0 2px 6px rgba(10, 20, 30, 0.04);
 }
 
 .item-info {
@@ -41,11 +42,32 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.item-settings-diff {
+  margin-left: 2px;
+  font-size: 0.78rem;
+  font-weight: 600;
+  color: #8a6d1f;
+  white-space: normal;
+}
 .file-details {
   font-size: 0.8rem;
   color: var(--color-text-muted);
 }
 
+.material-chip {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 8px;
+  border-radius: 999px;
+  border: 1px solid #d9d4bd;
+  background: #fbf7e9;
+  color: #6d5b1d;
+  font-size: 0.72rem;
+  font-weight: 700;
+  letter-spacing: 0.2px;
+}
+
 .item-controls {
   display: flex;
   align-items: center;
@@ -126,15 +148,40 @@
 
 .actions {
   display: flex;
-  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
   gap: var(--space-3);
+  margin-top: var(--space-2);
+
+  @media (max-width: 640px) {
+    flex-direction: column;
+    align-items: stretch;
+  }
+}
+
+.actions-left,
+.actions-right {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2);
+}
+
+.actions-right {
+  justify-content: flex-end;
+
+  @media (max-width: 640px) {
+    justify-content: flex-start;
+  }
 }
 
 .limit-note {
   font-size: 0.8rem;
   color: var(--color-text-muted);
-  text-align: center;
-  margin-top: calc(var(--space-2) * -1);
+  text-align: right;
+
+  @media (max-width: 640px) {
+    text-align: left;
+  }
 }
 
 .notes-section {
@@ -160,3 +207,14 @@
     white-space: pre-wrap; /* Preserve line breaks */
   }
 }
+
+.recalc-banner {
+  margin-top: var(--space-4);
+  margin-bottom: var(--space-4);
+  padding: var(--space-3);
+  border: 1px solid #f0c95a;
+  background: #fff8e1;
+  border-radius: var(--radius-md);
+  color: #6f5b1a;
+  font-size: 0.9rem;
+}

frontend/src/app/features/calculator/components/quote-result/quote-result.component.ts

@@ -35,6 +35,10 @@ export class QuoteResultComponent implements OnDestroy {
   readonly quantityAutoRefreshMs = 2000;
 
   result = input.required<QuoteResult>();
+  recalculationRequired = input<boolean>(false);
+  itemSettingsDiffByFileName = input<Record<string, { differences: string[] }>>(
+    {},
+  );
   consult = output<void>();
   proceed = output<void>();
   itemChange = output<{
@@ -43,6 +47,12 @@ export class QuoteResultComponent implements OnDestroy {
     fileName: string;
     quantity: number;
   }>();
+  itemQuantityPreviewChange = output<{
+    id?: string;
+    index: number;
+    fileName: string;
+    quantity: number;
+  }>();
 
   // Local mutable state for items to handle quantity changes
   items = signal<QuoteItem[]>([]);
@@ -87,6 +97,13 @@ export class QuoteResultComponent implements OnDestroy {
       return updated;
     });
 
+    this.itemQuantityPreviewChange.emit({
+      id: item.id,
+      index,
+      fileName: item.fileName,
+      quantity: normalizedQty,
+    });
+
     this.scheduleQuantityRefresh(index, key);
   }
 
@@ -120,8 +137,9 @@ export class QuoteResultComponent implements OnDestroy {
   totals = computed(() => {
     const currentItems = this.items();
     const setup = this.result().setupCost;
+    const cad = this.result().cadTotal || 0;
 
-    let price = setup;
+    let price = setup + cad;
     let time = 0;
     let weight = 0;
 
@@ -170,4 +188,31 @@ export class QuoteResultComponent implements OnDestroy {
     this.quantityTimers.forEach((timer) => clearTimeout(timer));
     this.quantityTimers.clear();
   }
+
+  getItemDifferenceLabel(fileName: string, materialCode?: string): string {
+    const differences =
+      this.itemSettingsDiffByFileName()[fileName]?.differences || [];
+    if (differences.length === 0) return '';
+
+    const normalizedMaterial = String(materialCode || '')
+      .trim()
+      .toLowerCase();
+
+    const filtered = differences.filter((entry) => {
+      const normalized = String(entry || '')
+        .trim()
+        .toLowerCase();
+      const isMaterialOnly = !normalized.includes(':');
+      return !(isMaterialOnly && normalized === normalizedMaterial);
+    });
+
+    if (filtered.length === 0) {
+      return '';
+    }
+
+    const materialOnly = filtered.find(
+      (entry) => !entry.includes(':') && entry.trim().length > 0,
+    );
+    return materialOnly || filtered.join(' | ');
+  }
 }

frontend/src/app/features/calculator/components/upload-form/upload-form.component.html

@@ -2,22 +2,20 @@
   <div class="section">
     @if (selectedFile()) {
       <div class="viewer-wrapper">
-        @if (!isStepFile(selectedFile())) {
+        @if (!canPreviewSelectedFile()) {
           <div class="step-warning">
             <p>{{ "CALC.STEP_WARNING" | translate }}</p>
           </div>
         } @else {
           <app-stl-viewer
-            [file]="selectedFile()"
+            [file]="getSelectedPreviewFile()"
             [color]="getSelectedFileColor()"
           >
           </app-stl-viewer>
         }
-        <!-- Close button removed as requested -->
       </div>
     }
 
-    <!-- Initial Dropzone (Visible only when no files) -->
     @if (items().length === 0) {
       <app-dropzone
         [label]="'CALC.UPLOAD_LABEL'"
@@ -29,7 +27,6 @@
       </app-dropzone>
     }
 
-    <!-- New File List with Details -->
     @if (items().length > 0) {
       <div class="items-grid">
         @for (item of items(); track item.file.name; let i = $index) {
@@ -63,7 +60,7 @@
                   <app-color-selector
                     [selectedColor]="item.color"
                     [selectedVariantId]="item.filamentVariantId ?? null"
-                    [variants]="currentMaterialVariants()"
+                    [variants]="getVariantsForMaterial(item.material)"
                     (colorSelected)="updateItemColor(i, $event)"
                   >
                   </app-color-selector>
@@ -83,7 +80,6 @@
         }
       </div>
 
-      <!-- "Add Files" Button (Visible only when files exist) -->
       <div class="add-more-container">
         <input
           #additionalInput
@@ -102,74 +98,168 @@
           + {{ "CALC.ADD_FILES" | translate }}
         </button>
       </div>
+
+      <p class="upload-privacy-note">
+        {{ "LEGAL.CONSENT.UPLOAD_NOTICE_PREFIX" | translate }}
+        <a href="/privacy" target="_blank" rel="noopener">{{
+          "LEGAL.CONSENT.UPLOAD_NOTICE_LINK" | translate
+        }}</a
+        >.
+      </p>
+
+      @if (mode() === "advanced") {
+        <div class="sync-settings">
+          <label class="sync-settings-toggle">
+            <input
+              type="checkbox"
+              [checked]="sameSettingsForAll()"
+              [disabled]="lockedSettings()"
+              (change)="onSameSettingsToggle($any($event.target).checked)"
+            />
+            <span class="sync-settings-copy">
+              <span class="sync-settings-title">
+                Stesse impostazioni per tutti i file
+              </span>
+              <span class="sync-settings-subtitle">Colore escluso</span>
+            </span>
+          </label>
+        </div>
+
+        @if (sameSettingsForAll()) {
+          <div class="item-settings-panel">
+            <h4 class="item-settings-title">Impostazioni globali</h4>
+
+            <div class="item-settings-grid">
+              <label>
+                {{ "CALC.MATERIAL" | translate }}
+                <select formControlName="material">
+                  @for (mat of materials(); track mat.value) {
+                    <option [value]="mat.value">{{ mat.label }}</option>
+                  }
+                </select>
+              </label>
+
+              <label>
+                {{ "CALC.NOZZLE" | translate }}
+                <select formControlName="nozzleDiameter">
+                  @for (n of nozzleDiameters(); track n.value) {
+                    <option [value]="n.value">{{ n.label }}</option>
+                  }
+                </select>
+              </label>
+            </div>
+
+            <div class="item-settings-grid">
+              <label>
+                {{ "CALC.PATTERN" | translate }}
+                <select formControlName="infillPattern">
+                  @for (p of infillPatterns(); track p.value) {
+                    <option [value]="p.value">{{ p.label }}</option>
+                  }
+                </select>
+              </label>
+
+              <label>
+                {{ "CALC.LAYER_HEIGHT" | translate }}
+                <select formControlName="layerHeight">
+                  @for (l of layerHeights(); track l.value) {
+                    <option [value]="l.value">{{ l.label }}</option>
+                  }
+                </select>
+              </label>
+            </div>
+
+            <div class="item-settings-grid">
+              <label>
+                {{ "CALC.INFILL" | translate }}
+                <input
+                  type="number"
+                  min="0"
+                  max="100"
+                  formControlName="infillDensity"
+                />
+              </label>
+
+              <label class="item-settings-checkbox">
+                <input type="checkbox" formControlName="supportEnabled" />
+                <span>{{ "CALC.SUPPORT" | translate }}</span>
+              </label>
+            </div>
+          </div>
+        } @else {
+          @if (getSelectedItem(); as selectedItem) {
+            <div class="item-settings-panel">
+              <h4 class="item-settings-title">
+                Impostazioni file: {{ selectedItem.file.name }}
+              </h4>
+
+              <div class="item-settings-grid">
+                <label>
+                  {{ "CALC.MATERIAL" | translate }}
+                  <select formControlName="material">
+                    @for (mat of materials(); track mat.value) {
+                      <option [value]="mat.value">{{ mat.label }}</option>
+                    }
+                  </select>
+                </label>
+
+                <label>
+                  {{ "CALC.NOZZLE" | translate }}
+                  <select formControlName="nozzleDiameter">
+                    @for (n of nozzleDiameters(); track n.value) {
+                      <option [value]="n.value">{{ n.label }}</option>
+                    }
+                  </select>
+                </label>
+              </div>
+
+              <div class="item-settings-grid">
+                <label>
+                  {{ "CALC.PATTERN" | translate }}
+                  <select formControlName="infillPattern">
+                    @for (p of infillPatterns(); track p.value) {
+                      <option [value]="p.value">{{ p.label }}</option>
+                    }
+                  </select>
+                </label>
+
+                <label>
+                  {{ "CALC.LAYER_HEIGHT" | translate }}
+                  <select formControlName="layerHeight">
+                    @for (l of getLayerHeightOptionsForNozzle(form.get('nozzleDiameter')?.value); track l.value) {
+                      <option [value]="l.value">{{ l.label }}</option>
+                    }
+                  </select>
+                </label>
+              </div>
+
+              <div class="item-settings-grid">
+                <label>
+                  {{ "CALC.INFILL" | translate }}
+                  <input
+                    type="number"
+                    min="0"
+                    max="100"
+                    formControlName="infillDensity"
+                  />
+                </label>
+
+                <label class="item-settings-checkbox">
+                  <input type="checkbox" formControlName="supportEnabled" />
+                  <span>{{ "CALC.SUPPORT" | translate }}</span>
+                </label>
+              </div>
+            </div>
+          }
+        }
+      }
     }
 
     @if (items().length === 0 && form.get("itemsTouched")?.value) {
       <div class="error-msg">{{ "CALC.ERR_FILE_REQUIRED" | translate }}</div>
     }
-
-    <p class="upload-privacy-note">
-      {{ "LEGAL.CONSENT.UPLOAD_NOTICE_PREFIX" | translate }}
-      <a href="/privacy" target="_blank" rel="noopener">{{
-        "LEGAL.CONSENT.UPLOAD_NOTICE_LINK" | translate
-      }}</a
-      >.
-    </p>
   </div>
 
-  <div class="grid">
-    <app-select
-      formControlName="material"
-      [label]="'CALC.MATERIAL' | translate"
-      [options]="materials()"
-    ></app-select>
-
-    @if (mode() === "easy") {
-      <app-select
-        formControlName="quality"
-        [label]="'CALC.QUALITY' | translate"
-        [options]="qualities()"
-      ></app-select>
-    } @else {
-      <app-select
-        formControlName="nozzleDiameter"
-        [label]="'CALC.NOZZLE' | translate"
-        [options]="nozzleDiameters()"
-      ></app-select>
-    }
-  </div>
-
-  <!-- Global quantity removed, now per item -->
-
-  @if (mode() === "advanced") {
-    <div class="grid">
-      <app-select
-        formControlName="infillPattern"
-        [label]="'CALC.PATTERN' | translate"
-        [options]="infillPatterns()"
-      ></app-select>
-
-      <app-select
-        formControlName="layerHeight"
-        [label]="'CALC.LAYER_HEIGHT' | translate"
-        [options]="layerHeights()"
-      ></app-select>
-    </div>
-
-    <div class="grid">
-      <app-input
-        formControlName="infillDensity"
-        type="number"
-        [label]="'CALC.INFILL' | translate"
-      ></app-input>
-
-      <div class="checkbox-row">
-        <input type="checkbox" formControlName="supportEnabled" id="support" />
-        <label for="support">{{ "CALC.SUPPORT" | translate }}</label>
-      </div>
-    </div>
-  }
-
   <app-input
     formControlName="notes"
     [label]="'CALC.NOTES' | translate"
@@ -177,7 +267,6 @@
   ></app-input>
 
   <div class="actions">
-    <!-- Progress Bar (Only when uploading i.e. progress < 100) -->
     @if (loading() && uploadProgress() < 100) {
       <div class="progress-container">
         <div class="progress-bar">

frontend/src/app/features/calculator/components/upload-form/upload-form.component.scss

@@ -2,9 +2,9 @@
   margin-bottom: var(--space-6);
 }
 .upload-privacy-note {
-  margin-top: var(--space-3);
-  margin-bottom: 0;
-  font-size: 0.78rem;
+  margin-top: var(--space-4);
+  margin-bottom: var(--space-1);
+  font-size: 0.8rem;
   color: var(--color-text-muted);
   text-align: left;
 }
@@ -35,48 +35,50 @@
 /* Grid Layout for Files */
 .items-grid {
   display: grid;
-  grid-template-columns: 1fr 1fr; /* Force 2 columns on mobile */
-  gap: var(--space-2); /* Tighten gap for mobile */
+  grid-template-columns: 1fr;
+  gap: var(--space-3);
   margin-top: var(--space-4);
   margin-bottom: var(--space-4);
 
   @media (min-width: 640px) {
+    grid-template-columns: 1fr 1fr;
     gap: var(--space-3);
   }
 }
 
 .file-card {
-  padding: var(--space-2); /* Reduced from space-3 */
-  background: var(--color-neutral-100);
+  padding: var(--space-3);
+  background: var(--color-bg-card);
   border: 1px solid var(--color-border);
   border-radius: var(--radius-md);
   transition: all 0.2s;
   cursor: pointer;
   display: flex;
   flex-direction: column;
-  gap: 4px; /* Reduced gap */
-  position: relative; /* For absolute positioning of remove btn */
-  min-width: 0; /* Allow flex item to shrink below content size if needed */
+  gap: var(--space-2);
+  position: relative;
+  min-width: 0;
 
   &:hover {
     border-color: var(--color-neutral-300);
+    box-shadow: 0 4px 10px rgba(10, 20, 30, 0.07);
   }
   &.active {
     border-color: var(--color-brand);
-    background: rgba(250, 207, 10, 0.05);
+    background: rgba(250, 207, 10, 0.08);
     box-shadow: 0 0 0 1px var(--color-brand);
   }
 }
 
 .card-header {
   overflow: hidden;
-  padding-right: 25px; /* Adjusted */
-  margin-bottom: 2px;
+  padding-right: 28px;
+  margin-bottom: 0;
 }
 
 .file-name {
-  font-weight: 500;
-  font-size: 0.8rem; /* Smaller font */
+  font-weight: 600;
+  font-size: 0.92rem;
   color: var(--color-text);
   display: block;
   white-space: nowrap;
@@ -92,47 +94,46 @@
 
 .card-controls {
   display: flex;
-  align-items: flex-end; /* Align bottom of input and color circle */
-  gap: 16px; /* Space between Qty and Color */
+  align-items: flex-end;
+  gap: var(--space-4);
   width: 100%;
 }
 
 .qty-group,
 .color-group {
   display: flex;
-  flex-direction: column; /* Stack label and input */
+  flex-direction: column;
   align-items: flex-start;
-  gap: 0px;
+  gap: 2px;
 
   label {
-    font-size: 0.6rem;
+    font-size: 0.72rem;
     color: var(--color-text-muted);
     text-transform: uppercase;
-    letter-spacing: 0.5px;
+    letter-spacing: 0.3px;
     font-weight: 600;
-    margin-bottom: 2px;
+    margin-bottom: 0;
   }
 }
 
 .color-group {
-  align-items: flex-start; /* Align label left */
-  /* margin-right removed */
+  align-items: flex-start;
 
-  /* Override margin in selector for this context */
   ::ng-deep .color-selector-container {
     margin-left: 0;
   }
 }
 
 .qty-input {
-  width: 36px; /* Slightly smaller */
-  padding: 1px 2px;
+  width: 54px;
+  padding: 4px 6px;
   border: 1px solid var(--color-border);
   border-radius: var(--radius-sm);
   text-align: center;
-  font-size: 0.85rem;
+  font-size: 0.95rem;
+  font-weight: 600;
   background: white;
-  height: 24px; /* Explicit height to match color circle somewhat */
+  height: 34px;
   &:focus {
     outline: none;
     border-color: var(--color-brand);
@@ -141,10 +142,10 @@
 
 .btn-remove {
   position: absolute;
-  top: 4px;
-  right: 4px;
-  width: 18px;
-  height: 18px;
+  top: 6px;
+  right: 6px;
+  width: 20px;
+  height: 20px;
   border-radius: 4px;
   border: none;
   background: transparent;
@@ -155,7 +156,7 @@
   align-items: center;
   justify-content: center;
   transition: all 0.2s;
-  font-size: 0.8rem;
+  font-size: 0.9rem;
 
   &:hover {
     background: var(--color-danger-100);
@@ -170,7 +171,7 @@
 
 .btn-add-more {
   width: 100%;
-  padding: var(--space-3);
+  padding: 0.75rem var(--space-3);
   background: var(--color-neutral-800);
   color: white;
   border: none;
@@ -193,6 +194,50 @@
   }
 }
 
+.sync-settings {
+  margin-top: var(--space-4);
+  margin-bottom: var(--space-4);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  background: var(--color-neutral-50);
+  padding: var(--space-3);
+}
+
+.sync-settings-toggle {
+  display: flex;
+  align-items: flex-start;
+  gap: var(--space-3);
+  cursor: pointer;
+
+  input[type="checkbox"] {
+    width: 20px;
+    height: 20px;
+    margin-top: 2px;
+    accent-color: var(--color-brand);
+    flex-shrink: 0;
+  }
+}
+
+.sync-settings-copy {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.sync-settings-title {
+  font-size: 0.95rem;
+  font-weight: 700;
+  color: var(--color-text);
+  line-height: 1.2;
+}
+
+.sync-settings-subtitle {
+  font-size: 0.8rem;
+  font-weight: 500;
+  color: var(--color-text-muted);
+  line-height: 1.35;
+}
+
 .checkbox-row {
   display: flex;
   align-items: center;
@@ -211,6 +256,12 @@
   }
 }
 
+.sync-all-row {
+  margin-top: var(--space-2);
+  margin-bottom: var(--space-4);
+  padding-top: 0;
+}
+
 /* Progress Bar */
 .progress-container {
   margin-bottom: var(--space-3);
@@ -244,3 +295,74 @@
   color: var(--color-text-muted);
   font-weight: 500;
 }
+
+.item-settings-panel {
+  margin-top: var(--space-4);
+  padding: var(--space-4);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  background: var(--color-bg-card);
+}
+
+.item-settings-title {
+  margin: 0 0 var(--space-4);
+  font-size: 1.05rem;
+  color: var(--color-text);
+}
+
+.item-settings-grid {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: var(--space-3);
+  margin-bottom: var(--space-3);
+
+  @media (min-width: 640px) {
+    grid-template-columns: 1fr 1fr;
+  }
+}
+
+.item-settings-grid label,
+.item-settings-checkbox {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-1);
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: var(--color-text);
+}
+
+.item-settings-grid input,
+.item-settings-grid select {
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  padding: 0.5rem 0.75rem;
+  background: var(--color-bg-card);
+  font-size: 1rem;
+  color: var(--color-text);
+
+  &:focus {
+    outline: none;
+    border-color: var(--color-brand);
+    box-shadow: 0 0 0 2px rgba(250, 207, 10, 0.25);
+  }
+}
+
+.item-settings-checkbox {
+  flex-direction: row;
+  align-items: center;
+  gap: var(--space-2);
+
+  input[type="checkbox"] {
+    width: 20px;
+    height: 20px;
+    accent-color: var(--color-brand);
+  }
+}
+
+.item-settings-checkbox--top {
+  margin-top: var(--space-4);
+  margin-bottom: var(--space-4);
+  color: var(--color-text);
+  font-size: 1rem;
+  font-weight: 500;
+}

frontend/src/app/features/calculator/services/quote-estimator.service.ts

@@ -1,16 +1,24 @@
 import { Injectable, inject, signal } from '@angular/core';
 import { HttpClient, HttpEventType } from '@angular/common/http';
 import { Observable, of } from 'rxjs';
-import { map, catchError, tap } from 'rxjs/operators';
 import { environment } from '../../../../environments/environment';
 
+export interface QuoteRequestItem {
+  file: File;
+  quantity: number;
+  material?: string;
+  quality?: string;
+  color?: string;
+  filamentVariantId?: number;
+  supportEnabled?: boolean;
+  infillDensity?: number;
+  infillPattern?: string;
+  layerHeight?: number;
+  nozzleDiameter?: number;
+}
+
 export interface QuoteRequest {
-  items: {
-    file: File;
-    quantity: number;
-    color?: string;
-    filamentVariantId?: number;
-  }[];
+  items: QuoteRequestItem[];
   material: string;
   quality: string;
   notes?: string;
@@ -26,12 +34,18 @@ export interface QuoteItem {
   id?: string;
   fileName: string;
   unitPrice: number;
-  unitTime: number; // seconds
-  unitWeight: number; // grams
+  unitTime: number;
+  unitWeight: number;
   quantity: number;
   material?: string;
+  quality?: string;
   color?: string;
   filamentVariantId?: number;
+  supportEnabled?: boolean;
+  infillDensity?: number;
+  infillPattern?: string;
+  layerHeight?: number;
+  nozzleDiameter?: number;
 }
 
 export interface QuoteResult {
@@ -39,6 +53,8 @@ export interface QuoteResult {
   items: QuoteItem[];
   setupCost: number;
   globalMachineCost: number;
+  cadHours?: number;
+  cadTotal?: number;
   currency: string;
   totalPrice: number;
   totalTimeHours: number;
@@ -47,36 +63,12 @@ export interface QuoteResult {
   notes?: string;
 }
 
-interface BackendResponse {
-  success: boolean;
-  data: {
-    print_time_seconds: number;
-    material_grams: number;
-    cost: {
-      total: number;
-    };
-  };
-  error?: string;
-}
-
-interface BackendQuoteResult {
-  totalPrice: number;
-  currency: string;
-  setupCost: number;
-  stats: {
-    printTimeSeconds: number;
-    printTimeFormatted: string;
-    filamentWeightGrams: number;
-    filamentLengthMm: number;
-  };
-}
-
-// Options Interfaces
 export interface MaterialOption {
   code: string;
   label: string;
   variants: VariantOption[];
 }
+
 export interface VariantOption {
   id: number;
   name: string;
@@ -87,28 +79,36 @@ export interface VariantOption {
   stockFilamentGrams: number;
   isOutOfStock: boolean;
 }
+
 export interface QualityOption {
   id: string;
   label: string;
 }
+
 export interface InfillOption {
   id: string;
   label: string;
 }
+
 export interface NumericOption {
   value: number;
   label: string;
 }
 
+export interface NozzleLayerHeightOptions {
+  nozzleDiameter: number;
+  layerHeights: NumericOption[];
+}
+
 export interface OptionsResponse {
   materials: MaterialOption[];
   qualities: QualityOption[];
   infillPatterns: InfillOption[];
   layerHeights: NumericOption[];
   nozzleDiameters: NumericOption[];
+  layerHeightsByNozzle: NozzleLayerHeightOptions[];
 }
 
-// UI Option for Select Component
 export interface SimpleOption {
   value: string | number;
   label: string;
@@ -120,70 +120,23 @@ export interface SimpleOption {
 export class QuoteEstimatorService {
   private http = inject(HttpClient);
 
-  private buildEasyModePreset(quality: string | undefined): {
-    quality: string;
-    layerHeight: number;
-    infillDensity: number;
-    infillPattern: string;
-    nozzleDiameter: number;
-  } {
-    const normalized = (quality || 'standard').toLowerCase();
-
-    // Legacy alias support.
-    if (normalized === 'high' || normalized === 'extra_fine') {
-      return {
-        quality: 'extra_fine',
-        layerHeight: 0.12,
-        infillDensity: 20,
-        infillPattern: 'grid',
-        nozzleDiameter: 0.4,
-      };
-    }
-
-    if (normalized === 'draft') {
-      return {
-        quality: 'extra_fine',
-        layerHeight: 0.24,
-        infillDensity: 12,
-        infillPattern: 'grid',
-        nozzleDiameter: 0.4,
-      };
-    }
-
-    return {
-      quality: 'standard',
-      layerHeight: 0.2,
-      infillDensity: 15,
-      infillPattern: 'grid',
-      nozzleDiameter: 0.4,
-    };
-  }
+  private pendingConsultation = signal<{
+    files: File[];
+    message: string;
+  } | null>(null);
 
   getOptions(): Observable<OptionsResponse> {
-    console.log('QuoteEstimatorService: Requesting options...');
     const headers: any = {};
-    return this.http
-      .get<OptionsResponse>(`${environment.apiUrl}/api/calculator/options`, {
-        headers,
-      })
-      .pipe(
-        tap({
-          next: (res) =>
-            console.log('QuoteEstimatorService: Options loaded', res),
-          error: (err) =>
-            console.error('QuoteEstimatorService: Options failed', err),
-        }),
-      );
+    return this.http.get<OptionsResponse>(`${environment.apiUrl}/api/calculator/options`, {
+      headers,
+    });
   }
 
-  // NEW METHODS for Order Flow
-
   getQuoteSession(sessionId: string): Observable<any> {
     const headers: any = {};
-    return this.http.get(
-      `${environment.apiUrl}/api/quote-sessions/${sessionId}`,
-      { headers },
-    );
+    return this.http.get(`${environment.apiUrl}/api/quote-sessions/${sessionId}`, {
+      headers,
+    });
   }
 
   updateLineItem(lineItemId: string, changes: any): Observable<any> {
@@ -222,13 +175,10 @@ export class QuoteEstimatorService {
 
   getOrderInvoice(orderId: string): Observable<Blob> {
     const headers: any = {};
-    return this.http.get(
-      `${environment.apiUrl}/api/orders/${orderId}/invoice`,
-      {
-        headers,
-        responseType: 'blob',
-      },
-    );
+    return this.http.get(`${environment.apiUrl}/api/orders/${orderId}/invoice`, {
+      headers,
+      responseType: 'blob',
+    });
   }
 
   getOrderConfirmation(orderId: string): Observable<Blob> {
@@ -250,73 +200,68 @@ export class QuoteEstimatorService {
   }
 
   calculate(request: QuoteRequest): Observable<number | QuoteResult> {
-    console.log('QuoteEstimatorService: Calculating quote...', request);
-    if (request.items.length === 0) {
-      console.warn('QuoteEstimatorService: No items to calculate');
-      return of();
+    if (!request.items || request.items.length === 0) {
+      return of(0);
     }
 
-    return new Observable((observer) => {
-      // 1. Create Session first
+    return new Observable<number | QuoteResult>((observer) => {
       const headers: any = {};
 
       this.http
         .post<any>(`${environment.apiUrl}/api/quote-sessions`, {}, { headers })
         .subscribe({
           next: (sessionRes) => {
-            const sessionId = sessionRes.id;
-            const sessionSetupCost = sessionRes.setupCostChf || 0;
+            const sessionId = String(sessionRes?.id || '');
+            if (!sessionId) {
+              observer.error('Could not initialize quote session');
+              return;
+            }
 
-            // 2. Upload files to this session
             const totalItems = request.items.length;
-            const allProgress: number[] = new Array(totalItems).fill(0);
-            const finalResponses: any[] = [];
-            let completedRequests = 0;
+            const uploadProgress = new Array(totalItems).fill(0);
+            const uploadResults: { success: boolean }[] = new Array(totalItems)
+              .fill(null)
+              .map(() => ({ success: false }));
+            let completed = 0;
 
-            const checkCompletion = () => {
+            const emitProgress = () => {
               const avg = Math.round(
-                allProgress.reduce((a, b) => a + b, 0) / totalItems,
+                uploadProgress.reduce((sum, value) => sum + value, 0) / totalItems,
               );
               observer.next(avg);
+            };
 
-              if (completedRequests === totalItems) {
-                finalize(finalResponses, sessionSetupCost, sessionId);
+            const finalize = () => {
+              emitProgress();
+              if (completed !== totalItems) {
+                return;
               }
+
+              const hasFailure = uploadResults.some((entry) => !entry.success);
+              if (hasFailure) {
+                observer.error('One or more files failed during upload/analysis');
+                return;
+              }
+
+              this.getQuoteSession(sessionId).subscribe({
+                next: (sessionData) => {
+                  observer.next(100);
+                  const result = this.mapSessionToQuoteResult(sessionData);
+                  result.notes = request.notes;
+                  observer.next(result);
+                  observer.complete();
+                },
+                error: () => {
+                  observer.error('Failed to calculate final quote');
+                },
+              });
             };
 
             request.items.forEach((item, index) => {
               const formData = new FormData();
               formData.append('file', item.file);
 
-              const easyPreset =
-                request.mode === 'easy'
-                  ? this.buildEasyModePreset(request.quality)
-                  : null;
-
-              const settings = {
-                complexityMode:
-                  request.mode === 'easy'
-                    ? 'ADVANCED'
-                    : request.mode.toUpperCase(),
-                material: request.material,
-                filamentVariantId: item.filamentVariantId,
-                quality: easyPreset ? easyPreset.quality : request.quality,
-                supportsEnabled: request.supportEnabled,
-                color: item.color || '#FFFFFF',
-                layerHeight: easyPreset
-                  ? easyPreset.layerHeight
-                  : request.layerHeight,
-                infillDensity: easyPreset
-                  ? easyPreset.infillDensity
-                  : request.infillDensity,
-                infillPattern: easyPreset
-                  ? easyPreset.infillPattern
-                  : request.infillPattern,
-                nozzleDiameter: easyPreset
-                  ? easyPreset.nozzleDiameter
-                  : request.nozzleDiameter,
-              };
-
+              const settings = this.buildSettingsPayload(request, item);
               const settingsBlob = new Blob([JSON.stringify(settings)], {
                 type: 'application/json',
               });
@@ -338,88 +283,69 @@ export class QuoteEstimatorService {
                       event.type === HttpEventType.UploadProgress &&
                       event.total
                     ) {
-                      allProgress[index] = Math.round(
+                      uploadProgress[index] = Math.round(
                         (100 * event.loaded) / event.total,
                       );
-                      checkCompletion();
-                    } else if (event.type === HttpEventType.Response) {
-                      allProgress[index] = 100;
-                      finalResponses[index] = {
-                        ...event.body,
-                        success: true,
-                        fileName: item.file.name,
-                        originalQty: item.quantity,
-                        originalItem: item,
-                      };
-                      completedRequests++;
-                      checkCompletion();
+                      emitProgress();
+                      return;
+                    }
+
+                    if (event.type === HttpEventType.Response) {
+                      uploadProgress[index] = 100;
+                      uploadResults[index] = { success: true };
+                      completed += 1;
+                      finalize();
                     }
                   },
-                  error: (err) => {
-                    console.error('Item upload failed', err);
-                    finalResponses[index] = {
-                      success: false,
-                      fileName: item.file.name,
-                    };
-                    completedRequests++;
-                    checkCompletion();
+                  error: () => {
+                    uploadProgress[index] = 100;
+                    uploadResults[index] = { success: false };
+                    completed += 1;
+                    finalize();
                   },
                 });
             });
           },
-          error: (err) => {
-            console.error('Failed to create session', err);
+          error: () => {
             observer.error('Could not initialize quote session');
           },
         });
-
-      const finalize = (
-        responses: any[],
-        setupCost: number,
-        sessionId: string,
-      ) => {
-        this.http
-          .get<any>(`${environment.apiUrl}/api/quote-sessions/${sessionId}`, {
-            headers,
-          })
-          .subscribe({
-            next: (sessionData) => {
-              observer.next(100);
-              const result = this.mapSessionToQuoteResult(sessionData);
-              result.notes = request.notes;
-              observer.next(result);
-              observer.complete();
-            },
-            error: (err) => {
-              console.error('Failed to fetch final session calculation', err);
-              observer.error('Failed to calculate final quote');
-            },
-          });
-      };
     });
   }
 
-  // Consultation Data Transfer
-  private pendingConsultation = signal<{
-    files: File[];
-    message: string;
-  } | null>(null);
-
   setPendingConsultation(data: { files: File[]; message: string }) {
     this.pendingConsultation.set(data);
   }
 
   getPendingConsultation() {
     const data = this.pendingConsultation();
-    this.pendingConsultation.set(null); // Clear after reading
+    this.pendingConsultation.set(null);
     return data;
   }
 
-  // Session File Retrieval
-  getLineItemContent(sessionId: string, lineItemId: string): Observable<Blob> {
+  getLineItemContent(
+    sessionId: string,
+    lineItemId: string,
+    preview = false,
+  ): Observable<Blob> {
+    const headers: any = {};
+    const previewQuery = preview ? '?preview=true' : '';
+    return this.http.get(
+      `${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items/${lineItemId}/content${previewQuery}`,
+      {
+        headers,
+        responseType: 'blob',
+      },
+    );
+  }
+
+  getLineItemStlPreview(
+    sessionId: string,
+    lineItemId: string,
+  ): Observable<Blob> {
     const headers: any = {};
     return this.http.get(
-      `${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items/${lineItemId}/content`,
+      `${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items/${lineItemId}/stl-preview`,
       {
         headers,
         responseType: 'blob',
@@ -428,45 +354,141 @@ export class QuoteEstimatorService {
   }
 
   mapSessionToQuoteResult(sessionData: any): QuoteResult {
-    const session = sessionData.session;
-    const items = sessionData.items || [];
+    const session = sessionData?.session || {};
+    const items = Array.isArray(sessionData?.items) ? sessionData.items : [];
+
     const totalTime = items.reduce(
       (acc: number, item: any) =>
-        acc + (item.printTimeSeconds || 0) * item.quantity,
-      0,
-    );
-    const totalWeight = items.reduce(
-      (acc: number, item: any) =>
-        acc + (item.materialGrams || 0) * item.quantity,
+        acc + Number(item?.printTimeSeconds || 0) * Number(item?.quantity || 1),
       0,
     );
 
+    const totalWeight = items.reduce(
+      (acc: number, item: any) =>
+        acc + Number(item?.materialGrams || 0) * Number(item?.quantity || 1),
+      0,
+    );
+
+    const grandTotal = Number(sessionData?.grandTotalChf);
+    const fallbackTotal =
+      Number(sessionData?.itemsTotalChf || 0) +
+      Number(session?.setupCostChf || 0) +
+      Number(sessionData?.shippingCostChf || 0);
+
     return {
-      sessionId: session.id,
+      sessionId: session?.id,
       items: items.map((item: any) => ({
-        id: item.id,
-        fileName: item.originalFilename,
-        unitPrice: item.unitPriceChf,
-        unitTime: item.printTimeSeconds,
-        unitWeight: item.materialGrams,
-        quantity: item.quantity,
-        material: session.materialCode, // Assumption: session has one material for all? or items have it?
-        // Backend model QuoteSession has materialCode.
-        // But line items might have different colors.
-        color: item.colorCode,
-        filamentVariantId: item.filamentVariantId,
+        id: item?.id,
+        fileName: item?.originalFilename,
+        unitPrice: Number(item?.unitPriceChf || 0),
+        unitTime: Number(item?.printTimeSeconds || 0),
+        unitWeight: Number(item?.materialGrams || 0),
+        quantity: Number(item?.quantity || 1),
+        material: item?.materialCode || session?.materialCode,
+        quality: item?.quality,
+        color: item?.colorCode,
+        filamentVariantId: item?.filamentVariantId,
+        supportEnabled: Boolean(item?.supportsEnabled),
+        infillDensity:
+          item?.infillPercent != null ? Number(item.infillPercent) : undefined,
+        infillPattern: item?.infillPattern,
+        layerHeight:
+          item?.layerHeightMm != null ? Number(item.layerHeightMm) : undefined,
+        nozzleDiameter:
+          item?.nozzleDiameterMm != null
+            ? Number(item.nozzleDiameterMm)
+            : undefined,
       })),
-      setupCost: session.setupCostChf || 0,
-      globalMachineCost: sessionData.globalMachineCostChf || 0,
-      currency: 'CHF', // Fixed for now
-      totalPrice:
-        (sessionData.itemsTotalChf || 0) +
-        (session.setupCostChf || 0) +
-        (sessionData.shippingCostChf || 0),
+      setupCost: Number(session?.setupCostChf || 0),
+      globalMachineCost: Number(sessionData?.globalMachineCostChf || 0),
+      cadHours: Number(session?.cadHours || 0),
+      cadTotal: Number(sessionData?.cadTotalChf || 0),
+      currency: 'CHF',
+      totalPrice: Number.isFinite(grandTotal) ? grandTotal : fallbackTotal,
       totalTimeHours: Math.floor(totalTime / 3600),
       totalTimeMinutes: Math.ceil((totalTime % 3600) / 60),
       totalWeight: Math.ceil(totalWeight),
-      notes: session.notes,
+      notes: session?.notes,
+    };
+  }
+
+  private buildSettingsPayload(request: QuoteRequest, item: QuoteRequestItem): any {
+    const normalizedQuality = this.normalizeQuality(item.quality || request.quality);
+    const easyPreset =
+      request.mode === 'easy'
+        ? this.buildEasyModePreset(normalizedQuality)
+        : null;
+
+    return {
+      complexityMode: request.mode === 'easy' ? 'BASIC' : 'ADVANCED',
+      material: String(item.material || request.material || 'PLA'),
+      color: item.color || '#FFFFFF',
+      filamentVariantId: item.filamentVariantId,
+      quality: easyPreset ? easyPreset.quality : normalizedQuality,
+      supportsEnabled: item.supportEnabled ?? request.supportEnabled ?? false,
+      layerHeight:
+        easyPreset?.layerHeight ?? item.layerHeight ?? request.layerHeight ?? 0.2,
+      infillDensity:
+        easyPreset?.infillDensity ??
+        item.infillDensity ??
+        request.infillDensity ??
+        20,
+      infillPattern:
+        easyPreset?.infillPattern ??
+        item.infillPattern ??
+        request.infillPattern ??
+        'grid',
+      nozzleDiameter:
+        easyPreset?.nozzleDiameter ??
+        item.nozzleDiameter ??
+        request.nozzleDiameter ??
+        0.4,
+    };
+  }
+
+  private normalizeQuality(value: string | undefined): string {
+    const normalized = String(value || 'standard').trim().toLowerCase();
+    if (normalized === 'high' || normalized === 'high_definition') {
+      return 'extra_fine';
+    }
+    return normalized || 'standard';
+  }
+
+  private buildEasyModePreset(quality: string): {
+    quality: string;
+    layerHeight: number;
+    infillDensity: number;
+    infillPattern: string;
+    nozzleDiameter: number;
+  } {
+    const normalized = this.normalizeQuality(quality);
+
+    if (normalized === 'draft') {
+      return {
+        quality: 'draft',
+        layerHeight: 0.28,
+        infillDensity: 15,
+        infillPattern: 'grid',
+        nozzleDiameter: 0.4,
+      };
+    }
+
+    if (normalized === 'extra_fine') {
+      return {
+        quality: 'extra_fine',
+        layerHeight: 0.12,
+        infillDensity: 20,
+        infillPattern: 'gyroid',
+        nozzleDiameter: 0.4,
+      };
+    }
+
+    return {
+      quality: 'standard',
+      layerHeight: 0.2,
+      infillDensity: 15,
+      infillPattern: 'grid',
+      nozzleDiameter: 0.4,
     };
   }
 }

frontend/src/app/features/checkout/checkout.component.html

@@ -1,6 +1,12 @@
 <div class="checkout-page">
   <div class="container hero">
     <h1 class="section-title">{{ "CHECKOUT.TITLE" | translate }}</h1>
+    <p class="cad-subtitle" *ngIf="isCadSession()">
+      Servizio CAD
+      <ng-container *ngIf="cadRequestId()">
+        riferito alla richiesta contatto #{{ cadRequestId() }}
+      </ng-container>
+    </p>
   </div>
 
   <div class="container">
@@ -239,6 +245,10 @@
                   <span
                     >{{ "CHECKOUT.QTY" | translate }}: {{ item.quantity }}</span
                   >
+                  <span>
+                    {{ "CHECKOUT.MATERIAL" | translate }}:
+                    {{ itemMaterial(item) }}
+                  </span>
                   <span
                     *ngIf="item.colorCode"
                     class="color-dot"
@@ -249,6 +259,41 @@
                   {{ item.printTimeSeconds / 3600 | number: "1.1-1" }}h |
                   {{ item.materialGrams | number: "1.0-0" }}g
                 </div>
+                <div class="item-preview" *ngIf="isCadSession() && isStlItem(item)">
+                  <ng-container
+                    *ngIf="previewFile(item) as itemPreview; else previewState"
+                  >
+                    <button
+                      type="button"
+                      class="preview-trigger"
+                      (click)="openPreview(item)"
+                      [attr.aria-label]="'CHECKOUT.PREVIEW_OPEN' | translate"
+                    >
+                      <div class="preview-surface">
+                        <app-stl-viewer
+                          [file]="itemPreview"
+                          [height]="116"
+                          [color]="previewColor(item)"
+                          [borderRadius]="'var(--radius-lg)'"
+                        ></app-stl-viewer>
+                        <span class="preview-pill">{{
+                          "CHECKOUT.PREVIEW_OPEN" | translate
+                        }}</span>
+                      </div>
+                    </button>
+                  </ng-container>
+                  <ng-template #previewState>
+                    <div class="preview-state" *ngIf="isPreviewLoading(item)">
+                      {{ "CHECKOUT.PREVIEW_LOADING" | translate }}
+                    </div>
+                    <div
+                      class="preview-state preview-state-error"
+                      *ngIf="!isPreviewLoading(item) && hasPreviewError(item)"
+                    >
+                      {{ "CHECKOUT.PREVIEW_UNAVAILABLE" | translate }}
+                    </div>
+                  </ng-template>
+                </div>
               </div>
               <div class="item-price">
                 <span class="item-total-price">
@@ -260,6 +305,17 @@
                 </small>
               </div>
             </div>
+            <div class="summary-item cad-summary-item" *ngIf="cadTotal() > 0">
+              <div class="item-details">
+                <span class="item-name">Servizio CAD</span>
+                <div class="item-specs-sub">{{ cadHours() }}h</div>
+              </div>
+              <div class="item-price">
+                <span class="item-total-price">
+                  {{ cadTotal() | currency: "CHF" }}
+                </span>
+              </div>
+            </div>
           </div>
 
           <div class="summary-totals" *ngIf="quoteSession() as session">
@@ -285,3 +341,30 @@
     </div>
   </div>
 </div>
+
+<div
+  class="preview-modal-backdrop"
+  *ngIf="previewModalOpen()"
+  (click)="closePreview()"
+>
+  <div class="preview-modal" (click)="$event.stopPropagation()">
+    <div class="preview-modal-header">
+      <h4>{{ selectedPreviewName() }}</h4>
+      <button
+        type="button"
+        class="preview-modal-close"
+        (click)="closePreview()"
+        [attr.aria-label]="'CHECKOUT.PREVIEW_CLOSE' | translate"
+      >
+        ×
+      </button>
+    </div>
+    <app-stl-viewer
+      *ngIf="selectedPreviewFile() as preview"
+      [file]="preview"
+      [height]="460"
+      [color]="selectedPreviewColor()"
+      [borderRadius]="'var(--radius-lg)'"
+    ></app-stl-viewer>
+  </div>
+</div>

frontend/src/app/features/checkout/checkout.component.scss

@@ -8,6 +8,11 @@
   }
 }
 
+.cad-subtitle {
+  margin: 0;
+  color: var(--color-text-muted);
+}
+
 .checkout-layout {
   display: grid;
   grid-template-columns: 1fr 420px;
@@ -239,6 +244,77 @@ app-toggle-selector.user-type-selector-compact {
       color: var(--color-text-muted);
       margin-top: 2px;
     }
+
+    .item-preview {
+      margin-top: var(--space-3);
+
+      .preview-trigger {
+        display: block;
+        width: 100%;
+        padding: 0;
+        margin: 0;
+        border: 0;
+        background: transparent;
+        cursor: pointer;
+        text-align: center;
+
+        .preview-surface {
+          position: relative;
+          width: min(320px, 100%);
+          margin-inline: auto;
+          border: 2px solid var(--color-border);
+          border-radius: var(--radius-lg);
+          overflow: hidden;
+          transition:
+            transform 0.18s ease,
+            box-shadow 0.18s ease,
+            border-color 0.18s ease;
+        }
+
+        .preview-pill {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          background: rgba(17, 24, 39, 0.84);
+          color: #fff;
+          border-radius: 999px;
+          font-size: 0.72rem;
+          font-weight: 700;
+          letter-spacing: 0.02em;
+          padding: 4px 10px;
+          pointer-events: none;
+        }
+
+        &:hover .preview-surface,
+        &:focus-visible .preview-surface {
+          border-color: var(--color-brand);
+          box-shadow: 0 8px 18px rgba(0, 0, 0, 0.14);
+          transform: translateY(-1px);
+        }
+
+        &:focus-visible {
+          outline: none;
+        }
+      }
+
+      .preview-state {
+        border: 1px solid var(--color-border);
+        border-radius: var(--radius-lg);
+        background: var(--color-neutral-50);
+        color: var(--color-text-muted);
+        font-size: 0.8rem;
+        min-height: 74px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: center;
+        padding: var(--space-2);
+      }
+
+      .preview-state-error {
+        color: var(--color-danger-600, #dc2626);
+      }
+    }
   }
 
   .item-price {
@@ -260,6 +336,13 @@ app-toggle-selector.user-type-selector-compact {
   }
 }
 
+.cad-summary-item {
+  background: var(--color-neutral-100);
+  border-radius: var(--radius-sm);
+  padding-left: var(--space-3);
+  padding-right: var(--space-3);
+}
+
 .summary-totals {
   background: var(--color-neutral-100);
   padding: var(--space-4);
@@ -304,6 +387,53 @@ app-toggle-selector.user-type-selector-compact {
   font-weight: 500;
 }
 
+.preview-modal-backdrop {
+  position: fixed;
+  inset: 0;
+  background: rgba(12, 16, 22, 0.72);
+  z-index: 1200;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-4);
+}
+
+.preview-modal {
+  width: min(820px, 96vw);
+  border-radius: var(--radius-lg);
+  border: 1px solid var(--color-border);
+  background: var(--color-bg-card);
+  box-shadow: 0 20px 60px rgba(0, 0, 0, 0.25);
+  padding: var(--space-4);
+}
+
+.preview-modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--space-3);
+  margin-bottom: var(--space-3);
+
+  h4 {
+    margin: 0;
+    font-size: 1rem;
+    line-height: 1.2;
+    word-break: break-word;
+  }
+}
+
+.preview-modal-close {
+  border: 1px solid var(--color-border);
+  background: var(--color-neutral-50);
+  color: var(--color-text);
+  width: 32px;
+  height: 32px;
+  border-radius: 999px;
+  cursor: pointer;
+  font-size: 1.1rem;
+  line-height: 1;
+}
+
 .mb-6 {
   margin-bottom: var(--space-6);
 }

frontend/src/app/features/checkout/checkout.component.ts

@@ -17,6 +17,7 @@ import {
   ToggleOption,
 } from '../../shared/components/app-toggle-selector/app-toggle-selector.component';
 import { LanguageService } from '../../core/services/language.service';
+import { StlViewerComponent } from '../../shared/components/stl-viewer/stl-viewer.component';
 
 @Component({
   selector: 'app-checkout',
@@ -29,6 +30,7 @@ import { LanguageService } from '../../core/services/language.service';
     AppButtonComponent,
     AppCardComponent,
     AppToggleSelectorComponent,
+    StlViewerComponent,
   ],
   templateUrl: './checkout.component.html',
   styleUrls: ['./checkout.component.scss'],
@@ -46,6 +48,13 @@ export class CheckoutComponent implements OnInit {
   error: string | null = null;
   isSubmitting = signal(false); // Add signal for submit state
   quoteSession = signal<any>(null); // Add signal for session details
+  previewFiles = signal<Record<string, File>>({});
+  previewLoading = signal<Record<string, boolean>>({});
+  previewErrors = signal<Record<string, boolean>>({});
+  previewModalOpen = signal(false);
+  selectedPreviewFile = signal<File | null>(null);
+  selectedPreviewName = signal('');
+  selectedPreviewColor = signal('#c9ced6');
 
   userTypeOptions: ToggleOption[] = [
     { label: 'CONTACT.TYPE_PRIVATE', value: 'PRIVATE' },
@@ -153,6 +162,11 @@ export class CheckoutComponent implements OnInit {
     this.quoteService.getQuoteSession(this.sessionId).subscribe({
       next: (session) => {
         this.quoteSession.set(session);
+        if (this.isCadSessionData(session)) {
+          this.loadStlPreviews(session);
+        } else {
+          this.resetPreviewState();
+        }
         console.log('Loaded session:', session);
       },
       error: (err) => {
@@ -162,6 +176,131 @@ export class CheckoutComponent implements OnInit {
     });
   }
 
+  isCadSession(): boolean {
+    return this.isCadSessionData(this.quoteSession());
+  }
+
+  cadRequestId(): string | null {
+    return this.quoteSession()?.session?.sourceRequestId ?? null;
+  }
+
+  cadHours(): number {
+    return this.quoteSession()?.session?.cadHours ?? 0;
+  }
+
+  cadTotal(): number {
+    return this.quoteSession()?.cadTotalChf ?? 0;
+  }
+
+  itemMaterial(item: any): string {
+    return String(
+      item?.materialCode ?? this.quoteSession()?.session?.materialCode ?? '-',
+    );
+  }
+
+  isStlItem(item: any): boolean {
+    const name = String(item?.originalFilename ?? '').toLowerCase();
+    return name.endsWith('.stl');
+  }
+
+  previewFile(item: any): File | null {
+    const id = String(item?.id ?? '');
+    if (!id) {
+      return null;
+    }
+    return this.previewFiles()[id] ?? null;
+  }
+
+  previewColor(item: any): string {
+    const raw = String(item?.colorCode ?? '').trim();
+    return raw || '#c9ced6';
+  }
+
+  isPreviewLoading(item: any): boolean {
+    const id = String(item?.id ?? '');
+    if (!id) {
+      return false;
+    }
+    return !!this.previewLoading()[id];
+  }
+
+  hasPreviewError(item: any): boolean {
+    const id = String(item?.id ?? '');
+    if (!id) {
+      return false;
+    }
+    return !!this.previewErrors()[id];
+  }
+
+  openPreview(item: any): void {
+    const file = this.previewFile(item);
+    if (!file) {
+      return;
+    }
+    this.selectedPreviewFile.set(file);
+    this.selectedPreviewName.set(String(item?.originalFilename ?? file.name));
+    this.selectedPreviewColor.set(this.previewColor(item));
+    this.previewModalOpen.set(true);
+  }
+
+  closePreview(): void {
+    this.previewModalOpen.set(false);
+    this.selectedPreviewFile.set(null);
+    this.selectedPreviewName.set('');
+    this.selectedPreviewColor.set('#c9ced6');
+  }
+
+  private loadStlPreviews(session: any): void {
+    if (
+      !this.sessionId ||
+      !this.isCadSessionData(session) ||
+      !Array.isArray(session?.items)
+    ) {
+      return;
+    }
+
+    for (const item of session.items) {
+      if (!this.isStlItem(item)) {
+        continue;
+      }
+
+      const id = String(item?.id ?? '');
+      if (!id || this.previewFiles()[id] || this.previewLoading()[id]) {
+        continue;
+      }
+
+      this.previewLoading.update((prev) => ({ ...prev, [id]: true }));
+      this.previewErrors.update((prev) => ({ ...prev, [id]: false }));
+
+      this.quoteService.getLineItemStlPreview(this.sessionId, id).subscribe({
+        next: (blob) => {
+          const originalName = String(item?.originalFilename ?? `${id}.stl`);
+          const stlName = originalName.toLowerCase().endsWith('.stl')
+            ? originalName
+            : `${originalName}.stl`;
+          const previewFile = new File([blob], stlName, { type: 'model/stl' });
+          this.previewFiles.update((prev) => ({ ...prev, [id]: previewFile }));
+          this.previewLoading.update((prev) => ({ ...prev, [id]: false }));
+        },
+        error: () => {
+          this.previewErrors.update((prev) => ({ ...prev, [id]: true }));
+          this.previewLoading.update((prev) => ({ ...prev, [id]: false }));
+        },
+      });
+    }
+  }
+
+  private isCadSessionData(session: any): boolean {
+    return session?.session?.status === 'CAD_ACTIVE';
+  }
+
+  private resetPreviewState(): void {
+    this.previewFiles.set({});
+    this.previewLoading.set({});
+    this.previewErrors.set({});
+    this.closePreview();
+  }
+
   onSubmit() {
     if (this.checkoutForm.invalid) {
       return;

frontend/src/app/features/contact/components/contact-form/contact-form.component.ts

@@ -11,6 +11,7 @@ import { AppInputComponent } from '../../../../shared/components/app-input/app-i
 import { AppButtonComponent } from '../../../../shared/components/app-button/app-button.component';
 import { QuoteEstimatorService } from '../../../calculator/services/quote-estimator.service';
 import { QuoteRequestService } from '../../../../core/services/quote-request.service';
+import { LanguageService } from '../../../../core/services/language.service';
 
 interface FilePreview {
   file: File;
@@ -53,6 +54,7 @@ export class ContactFormComponent implements OnDestroy {
   ];
 
   private quoteRequestService = inject(QuoteRequestService);
+  private languageService = inject(LanguageService);
 
   constructor(
     private fb: FormBuilder,
@@ -257,6 +259,7 @@ export class ContactFormComponent implements OnDestroy {
       const requestDto: any = {
         requestType: formVal.requestType,
         customerType: isCompany ? 'BUSINESS' : 'PRIVATE',
+        language: this.languageService.selectedLang(),
         email: formVal.email,
         phone: formVal.phone,
         message: formVal.message,

frontend/src/app/features/contact/contact.routes.ts

@@ -5,5 +5,10 @@ export const CONTACT_ROUTES: Routes = [
     path: '',
     loadComponent: () =>
       import('./contact-page.component').then((m) => m.ContactPageComponent),
+    data: {
+      seoTitle: 'Contatti | 3D fab',
+      seoDescription:
+        'Richiedi informazioni, preventivi personalizzati o supporto per progetti di stampa 3D.',
+    },
   },
 ];

frontend/src/app/features/home/home.component.html

@@ -37,28 +37,40 @@
       <div class="cap-cards">
         <app-card>
           <div class="card-image-placeholder">
-            <img src="assets/images/home/prototipi.jpg" alt="" />
+            <img
+              src="assets/images/home/prototipi.jpg"
+              [attr.alt]="'HOME.CAP_1_TITLE' | translate"
+            />
           </div>
           <h3>{{ "HOME.CAP_1_TITLE" | translate }}</h3>
           <p class="text-muted">{{ "HOME.CAP_1_TEXT" | translate }}</p>
         </app-card>
         <app-card>
           <div class="card-image-placeholder">
-            <img src="assets/images/home/original-vs-3dprinted.jpg" alt="" />
+            <img
+              src="assets/images/home/original-vs-3dprinted.jpg"
+              [attr.alt]="'HOME.CAP_2_TITLE' | translate"
+            />
           </div>
           <h3>{{ "HOME.CAP_2_TITLE" | translate }}</h3>
           <p class="text-muted">{{ "HOME.CAP_2_TEXT" | translate }}</p>
         </app-card>
         <app-card>
           <div class="card-image-placeholder">
-            <img src="assets/images/home/serie.jpg" alt="" />
+            <img
+              src="assets/images/home/serie.jpg"
+              [attr.alt]="'HOME.CAP_3_TITLE' | translate"
+            />
           </div>
           <h3>{{ "HOME.CAP_3_TITLE" | translate }}</h3>
           <p class="text-muted">{{ "HOME.CAP_3_TEXT" | translate }}</p>
         </app-card>
         <app-card>
           <div class="card-image-placeholder">
-            <img src="assets/images/home/cad.jpg" alt="" />
+            <img
+              src="assets/images/home/cad.jpg"
+              [attr.alt]="'HOME.CAP_4_TITLE' | translate"
+            />
           </div>
           <h3>{{ "HOME.CAP_4_TITLE" | translate }}</h3>
           <p class="text-muted">{{ "HOME.CAP_4_TEXT" | translate }}</p>

frontend/src/app/features/home/home.component.scss

@@ -205,10 +205,10 @@
   gap: var(--space-3);
 }
 
-.capabilities {
+.section.capabilities {
   position: relative;
   border-bottom: 1px solid var(--color-border);
-  padding-top: 3rem;
+  padding-top: 4.5rem;
 }
 .capabilities-bg {
   display: none;