feat(back-end front-end): new UX for

.gitea/workflows/cicd.yaml

@@ -21,16 +21,6 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
-      - name: Cache Gradle
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: gradle-${{ runner.os }}-${{ hashFiles('backend/gradle/wrapper/gradle-wrapper.properties', 'backend/**/*.gradle*', 'backend/gradle.properties') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
-
       - name: Run Tests with Gradle
         run: |
           cd backend
@@ -135,13 +125,23 @@ jobs:
 
           ssh-keyscan -H "${{ secrets.SERVER_HOST }}" >> ~/.ssh/known_hosts 2>/dev/null
 
-      - name: Write env to server
+      - name: Write env and compose to server
         shell: bash
         run: |
-          # 1. Start with the static env file content
+          # 1. Recalculate TAG and OWNER_LOWER (jobs don't share ENV)
+          if [[ "${{ gitea.ref }}" == "refs/heads/main" ]]; then
+            DEPLOY_TAG="prod"
+          elif [[ "${{ gitea.ref }}" == "refs/heads/int" ]]; then
+            DEPLOY_TAG="int"
+          else
+            DEPLOY_TAG="dev"
+          fi
+          DEPLOY_OWNER=$(echo '${{ gitea.repository_owner }}' | tr '[:upper:]' '[:lower:]')
+
+          # 2. Start with the static env file content
           cat "deploy/envs/${{ env.ENV }}.env" > /tmp/full_env.env
 
-          # 2. Determine DB credentials
+          # 3. Determine DB credentials
           if [[ "${{ env.ENV }}" == "prod" ]]; then
             DB_URL="${{ secrets.DB_URL_PROD }}"
             DB_USER="${{ secrets.DB_USERNAME_PROD }}"
@@ -156,17 +156,24 @@ jobs:
             DB_PASS="${{ secrets.DB_PASSWORD_DEV }}"
           fi
 
-          # 3. Append DB credentials
-          printf '\nDB_URL=%s\nDB_USERNAME=%s\nDB_PASSWORD=%s\n' \
+          # 4. Append DB and Docker credentials (quoted)
+          printf '\nDB_URL="%s"\nDB_USERNAME="%s"\nDB_PASSWORD="%s"\n' \
             "$DB_URL" "$DB_USER" "$DB_PASS" >> /tmp/full_env.env
+          
+          printf 'REGISTRY_URL="%s"\nREPO_OWNER="%s"\nTAG="%s"\n' \
+            "${{ secrets.REGISTRY_URL }}" "$DEPLOY_OWNER" "$DEPLOY_TAG" >> /tmp/full_env.env
 
-          # 4. Debug: print content (for debug purposes)
+          # 5. Debug: print content (for debug purposes)
           echo "Preparing to send env file with variables:"
           grep -v "PASSWORD" /tmp/full_env.env || true
 
-          # 5. Send to server
+          # 5. Send env to server
           ssh -i ~/.ssh/id_ed25519 -o BatchMode=yes "${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}" \
             "setenv ${{ env.ENV }}" < /tmp/full_env.env
+
+          # 6. Send docker-compose.deploy.yml to server
+          ssh -i ~/.ssh/id_ed25519 -o BatchMode=yes "${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}" \
+            "setcompose ${{ env.ENV }}" < docker-compose.deploy.yml
             
 
 

.gitignore

@@ -41,3 +41,8 @@ target/
 build/
 .gradle/
 .mvn/
+
+./storage_orders
+./storage_quotes
+storage_orders
+storage_quotes

GEMINI.md

@@ -4,39 +4,42 @@ Questo file serve a dare contesto all'AI (Antigravity/Gemini) sulla struttura e
 
 ## Project Overview
 **Nome**: Print Calculator
-**Scopo**: Calcolare costi e tempi di stampa 3D da file STL.
+**Scopo**: Calcolare costi e tempi di stampa 3D da file STL in modo preciso tramite slicing reale.
 **Stack**:
-- **Backend**: Python (FastAPI), libreria `trimesh` per analisi geometrica.
-- **Frontend**: Angular 19 (TypeScript).
+- **Backend**: Java 21 (Spring Boot 3.4), PostgreSQL, Flyway.
+- **Frontend**: Angular 19 (TypeScript), Angular Material, Three.js per visualizzazione 3D.
 
 ## Architecture
 
 ### Backend (`/backend`)
-- **`main.py`**: Entrypoint dell'applicazione FastAPI.
-    - Definisce l'API `POST /calculate/stl`.
-    - Gestisce l'upload del file, invoca lo slicer e restituisce il preventivo.
-    - Configura CORS per permettere chiamate dal frontend.
-- **`slicer.py`**: Wrappa l'eseguibile di **OrcaSlicer** per effettuare lo slicing reale del modello.
-    - Gestisce i profili di stampa (Macchina, Processo, Filamento).
-    - Crea configurazioni on-the-fly per supportare mesh di grandi dimensioni.
-- **`calculator.py`**: Analizza il G-Code generato.
-    - `GCodeParser`: Estrae tempo di stampa e materiale usato dai metadati del G-Code.
-    - `QuoteCalculator`: Applica i costi (orari, energia, materiale) per generare il prezzo finale.
+- **`BackendApplication.java`**: Entrypoint dell'applicazione Spring Boot.
+- **`controller/`**: Espone le API REST per l'upload e il calcolo dei preventivi.
+- **`service/SlicerService.java`**: Wrappa l'eseguibile di **OrcaSlicer** per effettuare lo slicing reale del modello.
+    - Gestisce i profili di stampa (Macchina, Processo, Filamento) caricati da file JSON.
+    - Crea configurazioni on-the-fly e invoca OrcaSlicer in modalità headless.
+- **`service/GCodeParser.java`**: Analizza il G-Code generato per estrarre tempo di stampa e peso del materiale dai metadati del file.
+- **`service/QuoteCalculator.java`**: Calcola il prezzo finale basandosi su politiche di prezzo salvate nel database.
+    - Gestisce costi macchina a scaglioni (tiered pricing).
+    - Calcola costi energetici basati sulla potenza della stampante e costo del kWh.
+    - Applica markup percentuali e fee fissi per job.
 
 ### Frontend (`/frontend`)
-- Applicazione Angular standard.
-- Usa Angular Material.
-- Service per upload STL e visualizzazione preventivo.
+- Applicazione Angular 19 con architettura modulare (core, features, shared).
+- **Three.js**: Utilizzato per il rendering dei file STL caricati dall'utente.
+- **Angular Material**: Per l'interfaccia utente.
+- **ngx-translate**: Per il supporto multilingua.
 
 ## Key Concepts
-- **Real Slicing**: Il backend esegue un vero slicing usando OrcaSlicer in modalità headless. Questo garantisce stime di tempo e materiale estremamente precise, identiche a quelle che si otterrebbero preparando il file per la stampa.
-- **G-Code Parsing**: Invece di stimare geometricamente, l'applicazione legge direttamene i commenti generati dallo slicer nel G-Code (es. `estimated printing time`, `filament used`).
+- **Real Slicing**: Il backend esegue un vero slicing usando OrcaSlicer. Questo garantisce stime di tempo e materiale estremamente precise.
+- **Database-Driven Pricing**: A differenza di versioni precedenti, il calcolo del preventivo è ora guidato da entità DB (`PricingPolicy`, `PrinterMachine`, `FilamentVariant`).
+- **G-Code Metadata**: L'applicazione legge direttamene i commenti generati dallo slicer nel G-Code (es. `; estimated printing time`, `; filament used [g]`).
 
 ## Development Notes
-- Per eseguire il backend serve `uvicorn`.
-- Il frontend richiede `npm install` al primo avvio.
-- Le configurazioni di stampa (layer height, wall thickness, infill) sono attualmente hardcoded o con valori di default nel backend, ma potrebbero essere esposte come parametri API in futuro.
+- **Backend**: Richiede JDK 21. Si avvia con `./gradlew bootRun`.
+- **Database**: Richiede PostgreSQL. Le migrazioni sono gestite da Flyway.
+- **Frontend**: Richiede Node.js 22. Si avvia con `npm start`.
+- **OrcaSlicer**: Deve essere installato sul sistema e il percorso configurato in `application.properties` o tramite variabile d'ambiente `SLICER_PATH`.
 
 ## AI Agent Rules
 - **No Inline Code**: Tutti i componenti Angular DEVONO usare file separati per HTML (`templateUrl`) e SCSS (`styleUrl`). È vietato usare `template` o `styles` inline nel decoratore `@Component`.
-
+- **Spring Boot Conventions**: Seguire i pattern standard di Spring Boot (Service-Repository-Controller).

README.md

@@ -1,70 +1,67 @@
 # Print Calculator (OrcaSlicer Edition)
 
-Un'applicazione Full Stack (Angular + Python/FastAPI) per calcolare preventivi di stampa 3D precisi utilizzando **OrcaSlicer** in modalità headless.
+Un'applicazione Full Stack (Angular + Spring Boot) per calcolare preventivi di stampa 3D precisi utilizzando **OrcaSlicer** in modalità headless.
 
 ## Funzionalità
 
-*   **Slicing Reale**: Usa il motore di OrcaSlicer per stimare tempo e materiale, non semplici approssimazioni geometriche.
-*   **Preventivazione Completa**: Calcola costo materiale, ammortamento macchina, energia e ricarico.
-*   **Configurabile**: Prezzi e parametri macchina modificabili via variabili d'ambiente.
-*   **Docker Ready**: Tutto containerizzato per un facile deployment.
+*   **Slicing Reale**: Usa il motore di OrcaSlicer per stimare tempo e materiale, garantendo la massima precisione.
+*   **Preventivazione Database-Driven**: Calcolo basato su politiche di prezzo configurabili nel database (costo materiale, ammortamento macchina a scaglioni, energia e markup).
+*   **Visualizzazione 3D**: Anteprima del file STL caricato tramite Three.js.
+*   **Multi-Profilo**: Supporto per diverse stampanti, materiali e profili di processo.
+
+## Stack Tecnologico
+
+- **Backend**: Java 21, Spring Boot 3.4, PostgreSQL, Flyway.
+- **Frontend**: Angular 19, Angular Material, Three.js.
+- **Slicer**: OrcaSlicer (invocato via CLI).
 
 ## Prerequisiti
 
-*   Docker Desktop & Docker Compose installati.
+*   **Java 21** installato.
+*   **Node.js 22** e **npm** installati.
+*   **PostgreSQL** attivo.
+*   **OrcaSlicer** installato sul sistema.
 
 ## Avvio Rapido
 
-1.  Clona il repository.
-2.  Esegui lo script di avvio o docker-compose:
-    ```bash
-    docker-compose up --build
-    ```
-    *Nota: La prima build impiegherà alcuni minuti per scaricare OrcaSlicer (~200MB) e compilare il Frontend.*
+### 1. Database
+Crea un database PostgreSQL chiamato `printcalc`. Le tabelle verranno create automaticamente al primo avvio tramite Flyway.
 
-3.  Accedi all'applicazione:
-    *   **Frontend**: [http://localhost](http://localhost)
-    *   **API Docs**: [http://localhost:8000/docs](http://localhost:8000/docs)
+### 2. Backend
+Configura il percorso di OrcaSlicer in `backend/src/main/resources/application.properties` o tramite la variabile d'ambiente `SLICER_PATH`.
 
-## Configurazione Prezzi
-
-Puoi modificare i prezzi nel file `docker-compose.yml` (sezione `environment` del servizio backend):
-
-*   `FILAMENT_COST_PER_KG`: Costo filamento al kg (es. 25.0).
-*   `MACHINE_COST_PER_HOUR`: Costo orario macchina (ammortamento/manutenzione).
-*   `ENERGY_COST_PER_KWH`: Costo energia elettrica.
-*   `MARKUP_PERCENT`: Margine di profitto percentuale (es. 20 = +20%).
-
-## Struttura del Progetto
-
-*   `/backend`: API Python FastAPI. Include Dockerfile che scarica OrcaSlicer AppImage.
-*   `/frontend`: Applicazione Angular 19+ con Material Design.
-*   `/backend/profiles`: Contiene i profili di slicing (.ini). Attualmente configurato per una stima generica simil-Bambu Lab A1.
-
-## Troubleshooting
-
-### Errore Download OrcaSlicer
-Se la build del backend fallisce durante il download di `OrcaSlicer.AppImage`, verifica la tua connessione internet o aggiorna l'URL nel `backend/Dockerfile`.
-
-### Slicing Fallito (Costo 0 o Errore)
-Se l'API ritorna errore o valori nulli:
-1.  Controlla che il file STL sia valido (manifold).
-2.  Controlla i log del backend: `docker logs print-calculator-backend`.
-
-## Sviluppo Locale (Senza Docker)
-
-**Backend**:
-Richiede Linux (o WSL2) per eseguire l'AppImage di OrcaSlicer.
 ```bash
 cd backend
-pip install -r requirements.txt
-# Assicurati di avere OrcaSlicer installato e nel PATH o aggiorna SLICER_PATH in slicer.py
-uvicorn main:app --reload
+./gradlew bootRun
 ```
 
-**Frontend**:
+### 3. Frontend
 ```bash
 cd frontend
 npm install
 npm start
 ```
+
+Accedi a [http://localhost:4200](http://localhost:4200).
+
+## Configurazione Prezzi
+
+I prezzi non sono più gestiti tramite variabili d'ambiente fisse ma tramite tabelle nel database:
+- `pricing_policy`: Definisce markup, fee fissi e costi elettrici.
+- `pricing_policy_machine_hour_tier`: Definisce i costi orari delle macchine in base alla durata della stampa.
+- `printer_machine`: Anagrafica stampanti e consumi energetici.
+- `filament_material_type` / `filament_variant`: Listino prezzi materiali.
+
+## Struttura del Progetto
+
+*   `/backend`: API Spring Boot.
+*   `/frontend`: Applicazione Angular.
+*   `/backend/profiles`: Contiene i file di configurazione per OrcaSlicer.
+
+## Troubleshooting
+
+### Percorso OrcaSlicer
+Assicurati che `slicer.path` punti al binario corretto. Su macOS è solitamente `/Applications/OrcaSlicer.app/Contents/MacOS/OrcaSlicer`. Su Linux è il percorso all'AppImage (estratta o meno).
+
+### Database connection
+Verifica le credenziali in `application.properties`. Se usi Docker, puoi passare `DB_URL`, `DB_USERNAME` e `DB_PASSWORD` come variabili d'ambiente.

backend/build.gradle

@@ -25,10 +25,22 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'xyz.capybara:clamav-client:2.1.2'
 	runtimeOnly 'org.postgresql:postgresql'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'com.h2database:h2'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
+	implementation 'io.github.openhtmltopdf:openhtmltopdf-pdfbox:1.1.37'
+	implementation 'io.github.openhtmltopdf:openhtmltopdf-svg-support:1.1.37'
+	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'
+
+
+
 }
 
 tasks.named('test') {

backend/entrypoint.sh

@@ -3,13 +3,25 @@ echo "----------------------------------------------------------------"
 echo "Starting Backend Application"
 echo "DB_URL: $DB_URL"
 echo "DB_USERNAME: $DB_USERNAME"
+echo "SPRING_DATASOURCE_URL: $SPRING_DATASOURCE_URL"
 echo "SLICER_PATH: $SLICER_PATH"
 echo "--- ALL ENV VARS ---"
 env
 echo "----------------------------------------------------------------"
 
-# Exec java with explicit properties from env
-exec java -jar app.jar \
-  --spring.datasource.url="${DB_URL}" \
-  --spring.datasource.username="${DB_USERNAME}" \
-  --spring.datasource.password="${DB_PASSWORD}"
+# Determine which environment variables to use for database connection
+# This allows compatibility with different docker-compose configurations
+FINAL_DB_URL="${DB_URL:-$SPRING_DATASOURCE_URL}"
+FINAL_DB_USER="${DB_USERNAME:-$SPRING_DATASOURCE_USERNAME}"
+FINAL_DB_PASS="${DB_PASSWORD:-$SPRING_DATASOURCE_PASSWORD}"
+
+if [ -n "$FINAL_DB_URL" ]; then
+  echo "Using database URL: $FINAL_DB_URL"
+  exec java -jar app.jar \
+    --spring.datasource.url="${FINAL_DB_URL}" \
+    --spring.datasource.username="${FINAL_DB_USER}" \
+    --spring.datasource.password="${FINAL_DB_PASS}"
+else
+  echo "No database URL specified in environment, relying on application.properties defaults."
+  exec java -jar app.jar
+fi

backend/profiles/profiles/BBL/machine/fdm_bbl_3dp_001_common.json

@@ -139,4 +139,4 @@
     "layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firmware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 X65 Y245 F20000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F20000\nG1 Y265 F3000\nM400 P300\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255 F20000\n{endif}\nM623\n; update layer progress\nM73 L{layer_num+1}\nM991 S0 P{layer_num} ;notify layer change",
     "change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1 && (z_hop_types[current_extruder] == 0 || z_hop_types[current_extruder] == 3)}\nG17\nG2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F21000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\nM106 P2 S0\n{if old_filament_temp > 142 && next_extruder < 255}\nM104 S[old_filament_temp]\n{endif}\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 X120 F15000\n\nG1 X20 Y50 F21000\nG1 Y-3\n{if toolchange_count == 2}\n; get travel path for change filament\nM620.1 X[travel_point_1_x] Y[travel_point_1_y] F21000 P0\nM620.1 X[travel_point_2_x] Y[travel_point_2_y] F21000 P1\nM620.1 X[travel_point_3_x] Y[travel_point_3_y] F21000 P2\n{endif}\nM620.1 E F[old_filament_e_feedrate] T{nozzle_temperature_range_high[previous_extruder]}\nT[next_extruder]\nM620.1 E F[new_filament_e_feedrate] T{nozzle_temperature_range_high[next_extruder]}\n\n{if next_extruder < 255}\nM400\n\nG92 E0\n{if flush_length_1 > 1}\n; FLUSH_START\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n; FLUSH_START\nM400\nM109 S[new_filament_temp]\nG1 E2 F{new_filament_e_feedrate} ;Compensate for filament spillage during waiting temperature\n; FLUSH_END\nM400\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z{max_layer_z + 3.0} F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A",
     "machine_pause_gcode": "M400 U1"
-}
+}

backend/src/main/java/com/printcalculator/BackendApplication.java

@@ -2,8 +2,15 @@ package com.printcalculator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
+@EnableTransactionManagement
+@EnableScheduling
+@EnableAsync
 public class BackendApplication {
 
 	public static void main(String[] args) {

backend/src/main/java/com/printcalculator/config/CorsConfig.java

@@ -11,8 +11,16 @@ public class CorsConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost", "http://localhost:4200", "http://localhost:80", "http://127.0.0.1")
-                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedOrigins(
+                        "http://localhost",
+                        "http://localhost:4200",
+                        "http://localhost:80",
+                        "http://127.0.0.1",
+                        "https://dev.3d-fab.ch",
+                        "https://int.3d-fab.ch",
+                        "https://3d-fab.ch"
+                )
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")
                 .allowedHeaders("*")
                 .allowCredentials(true);
     }

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

@@ -0,0 +1,127 @@
+package com.printcalculator.controller;
+
+import com.printcalculator.entity.CustomQuoteRequest;
+import com.printcalculator.entity.CustomQuoteRequestAttachment;
+import com.printcalculator.repository.CustomQuoteRequestAttachmentRepository;
+import com.printcalculator.repository.CustomQuoteRequestRepository;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/api/custom-quote-requests")
+public class CustomQuoteRequestController {
+
+    private final CustomQuoteRequestRepository requestRepo;
+    private final CustomQuoteRequestAttachmentRepository attachmentRepo;
+    private final com.printcalculator.service.ClamAVService clamAVService;
+    
+    // TODO: Inject Storage Service
+    private static final String STORAGE_ROOT = "storage_requests";
+
+    public CustomQuoteRequestController(CustomQuoteRequestRepository requestRepo,
+                                        CustomQuoteRequestAttachmentRepository attachmentRepo,
+                                        com.printcalculator.service.ClamAVService clamAVService) {
+        this.requestRepo = requestRepo;
+        this.attachmentRepo = attachmentRepo;
+        this.clamAVService = clamAVService;
+    }
+
+    // 1. Create Custom Quote Request
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Transactional
+    public ResponseEntity<CustomQuoteRequest> createCustomQuoteRequest(
+            @RequestPart("request") com.printcalculator.dto.QuoteRequestDto requestDto,
+            @RequestPart(value = "files", required = false) List<MultipartFile> files
+    ) throws IOException {
+        
+        // 1. Create Request
+        CustomQuoteRequest request = new CustomQuoteRequest();
+        request.setRequestType(requestDto.getRequestType());
+        request.setCustomerType(requestDto.getCustomerType());
+        request.setEmail(requestDto.getEmail());
+        request.setPhone(requestDto.getPhone());
+        request.setName(requestDto.getName());
+        request.setCompanyName(requestDto.getCompanyName());
+        request.setContactPerson(requestDto.getContactPerson());
+        request.setMessage(requestDto.getMessage());
+        request.setStatus("PENDING");
+        request.setCreatedAt(OffsetDateTime.now());
+        request.setUpdatedAt(OffsetDateTime.now());
+        
+        request = requestRepo.save(request);
+        
+        // 2. Handle Attachments
+        if (files != null && !files.isEmpty()) {
+            if (files.size() > 15) {
+                throw new IOException("Too many files. Max 15 allowed.");
+            }
+            
+            for (MultipartFile file : files) {
+                if (file.isEmpty()) continue;
+                
+                // Scan for virus
+                clamAVService.scan(file.getInputStream());
+                
+                CustomQuoteRequestAttachment attachment = new CustomQuoteRequestAttachment();
+                attachment.setRequest(request);
+                attachment.setOriginalFilename(file.getOriginalFilename());
+                attachment.setMimeType(file.getContentType());
+                attachment.setFileSizeBytes(file.getSize());
+                attachment.setCreatedAt(OffsetDateTime.now());
+                
+                // Generate path
+                UUID fileUuid = UUID.randomUUID();
+                String ext = getExtension(file.getOriginalFilename());
+                String storedFilename = fileUuid.toString() + "." + ext;
+                
+                // Note: We don't have attachment ID yet.
+                // We'll save attachment first to get ID.
+                attachment.setStoredFilename(storedFilename);
+                attachment.setStoredRelativePath("PENDING");
+                
+                attachment = attachmentRepo.save(attachment);
+                
+                String relativePath = "quote-requests/" + request.getId() + "/attachments/" + attachment.getId() + "/" + storedFilename;
+                attachment.setStoredRelativePath(relativePath);
+                attachmentRepo.save(attachment);
+                
+                // Save file to disk
+                Path absolutePath = Paths.get(STORAGE_ROOT, relativePath);
+                Files.createDirectories(absolutePath.getParent());
+                Files.copy(file.getInputStream(), absolutePath);
+            }
+        }
+        
+        return ResponseEntity.ok(request);
+    }
+    
+    // 2. Get Request
+    @GetMapping("/{id}")
+    public ResponseEntity<CustomQuoteRequest> getCustomQuoteRequest(@PathVariable UUID id) {
+        return requestRepo.findById(id)
+                .map(ResponseEntity::ok)
+                .orElse(ResponseEntity.notFound().build());
+    }
+    
+    // Helper
+    private String getExtension(String filename) {
+        if (filename == null) return "dat";
+        int i = filename.lastIndexOf('.');
+        if (i > 0) {
+            return filename.substring(i + 1);
+        }
+        return "dat";
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.printcalculator.controller;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/api/dev/email")
+@Profile("local")
+public class DevEmailTestController {
+
+    private final TemplateEngine templateEngine;
+
+    public DevEmailTestController(TemplateEngine templateEngine) {
+        this.templateEngine = templateEngine;
+    }
+
+    @GetMapping("/test-template")
+    public ResponseEntity<String> testTemplate() {
+        Context context = new Context();
+        Map<String, Object> templateData = new HashMap<>();
+        UUID orderId = UUID.randomUUID();
+        templateData.put("customerName", "Mario Rossi");
+        templateData.put("orderId", orderId);
+        templateData.put("orderNumber", orderId.toString().split("-")[0]);
+        templateData.put("orderDetailsUrl", "https://tuosito.it/ordine/" + orderId);
+        templateData.put("orderDate", OffsetDateTime.now().format(DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")));
+        templateData.put("totalCost", "45.50");
+        
+        context.setVariables(templateData);
+        String html = templateEngine.process("email/order-confirmation", context);
+        
+        return ResponseEntity.ok()
+                .header("Content-Type", "text/html; charset=utf-8")
+                .body(html);
+    }
+}

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

@@ -0,0 +1,342 @@
+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 org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+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;
+
+@RestController
+@RequestMapping("/api/orders")
+public class OrderController {
+
+    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;
+
+
+    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;
+    }
+
+
+    // 1. Create Order from Quote
+    @PostMapping("/from-quote/{quoteSessionId}")
+    @Transactional
+    public ResponseEntity<OrderDto> createOrderFromQuote(
+            @PathVariable UUID quoteSessionId,
+            @RequestBody com.printcalculator.dto.CreateOrderRequest request
+    ) {
+        Order order = orderService.createOrderFromQuote(quoteSessionId, request);
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+        return ResponseEntity.ok(convertToDto(order, items));
+    }
+    
+    @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
+    ) throws IOException {
+        
+        OrderItem item = orderItemRepo.findById(orderItemId)
+                .orElseThrow(() -> new RuntimeException("OrderItem not found"));
+                
+        if (!item.getOrder().getId().equals(orderId)) {
+            return ResponseEntity.badRequest().build();
+        }
+        
+        String relativePath = item.getStoredRelativePath();
+        if (relativePath == null || relativePath.equals("PENDING")) {
+             String ext = getExtension(file.getOriginalFilename());
+             String storedFilename = UUID.randomUUID().toString() + "." + ext;
+             relativePath = "orders/" + orderId + "/3d-files/" + orderItemId + "/" + storedFilename;
+             item.setStoredRelativePath(relativePath);
+             item.setStoredFilename(storedFilename);
+        }
+        
+        storageService.store(file, Paths.get(relativePath));
+        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));
+                })
+                .orElse(ResponseEntity.notFound().build());
+    }
+
+    @PostMapping("/{orderId}/payments/report")
+    @Transactional
+    public ResponseEntity<OrderDto> reportPayment(
+            @PathVariable UUID orderId,
+            @RequestBody Map<String, String> payload
+    ) {
+        String method = payload.get("method");
+        paymentService.reportPayment(orderId, method);
+        return getOrder(orderId);
+    }
+
+    @GetMapping("/{orderId}/invoice")
+    public ResponseEntity<byte[]> getInvoice(@PathVariable UUID orderId) {
+        Order order = orderRepo.findById(orderId)
+                .orElseThrow(() -> new RuntimeException("Order not found"));
+
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(orderId);
+
+        Map<String, Object> vars = new HashMap<>();
+        vars.put("sellerDisplayName", "3D Fab Switzerland");
+        vars.put("sellerAddressLine1", "Sede Ticino, Svizzera");
+        vars.put("sellerAddressLine2", "Sede Bienne, Svizzera");
+        vars.put("sellerEmail", "info@3dfab.ch");
+
+        vars.put("invoiceNumber", "INV-" + getDisplayOrderNumber(order).toUpperCase());
+        vars.put("invoiceDate", order.getCreatedAt().format(DateTimeFormatter.ISO_LOCAL_DATE));
+        vars.put("dueDate", order.getCreatedAt().plusDays(7).format(DateTimeFormatter.ISO_LOCAL_DATE));
+
+        String buyerName = order.getBillingCustomerType().equals("BUSINESS") 
+            ? order.getBillingCompanyName() 
+            : order.getBillingFirstName() + " " + order.getBillingLastName();
+        vars.put("buyerDisplayName", buyerName);
+        vars.put("buyerAddressLine1", order.getBillingAddressLine1());
+        vars.put("buyerAddressLine2", order.getBillingZip() + " " + order.getBillingCity() + ", " + order.getBillingCountryCode());
+
+        List<Map<String, Object>> invoiceLineItems = items.stream().map(i -> {
+            Map<String, Object> line = new HashMap<>();
+            line.put("description", "Stampa 3D: " + i.getOriginalFilename());
+            line.put("quantity", i.getQuantity());
+            line.put("unitPriceFormatted", String.format("CHF %.2f", i.getUnitPriceChf()));
+            line.put("lineTotalFormatted", String.format("CHF %.2f", i.getLineTotalChf()));
+            return line;
+        }).collect(Collectors.toList());
+
+        Map<String, Object> setupLine = new HashMap<>();
+        setupLine.put("description", "Costo Setup");
+        setupLine.put("quantity", 1);
+        setupLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
+        setupLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
+        invoiceLineItems.add(setupLine);
+
+        Map<String, Object> shippingLine = new HashMap<>();
+        shippingLine.put("description", "Spedizione");
+        shippingLine.put("quantity", 1);
+        shippingLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
+        shippingLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
+        invoiceLineItems.add(shippingLine);
+
+        vars.put("invoiceLineItems", invoiceLineItems);
+        vars.put("subtotalFormatted", String.format("CHF %.2f", order.getSubtotalChf()));
+        vars.put("grandTotalFormatted", String.format("CHF %.2f", order.getTotalChf()));
+        vars.put("paymentTermsText", "Pagamento entro 7 giorni via Bonifico o TWINT. Grazie.");
+
+        String qrBillSvg = new String(qrBillService.generateQrBillSvg(order), java.nio.charset.StandardCharsets.UTF_8);
+        
+        // Strip XML declaration and DOCTYPE if present, as they validity break the embedding HTML page
+        if (qrBillSvg.contains("<?xml")) {
+            int svgStartIndex = qrBillSvg.indexOf("<svg");
+            if (svgStartIndex != -1) {
+                qrBillSvg = qrBillSvg.substring(svgStartIndex);
+            }
+        }
+        
+        byte[] pdf = invoiceService.generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
+
+        return ResponseEntity.ok()
+                .header("Content-Disposition", "attachment; filename=\"invoice-" + getDisplayOrderNumber(order) + ".pdf\"")
+                .contentType(MediaType.APPLICATION_PDF)
+                .body(pdf);
+    }
+
+    @GetMapping("/{orderId}/twint")
+    public ResponseEntity<Map<String, String>> getTwintPayment(@PathVariable UUID orderId) {
+        if (!orderRepo.existsById(orderId)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        byte[] qrPng = twintPaymentService.generateQrPng(360);
+        String qrDataUri = "data:image/png;base64," + Base64.getEncoder().encodeToString(qrPng);
+
+        Map<String, String> data = new HashMap<>();
+        data.put("paymentUrl", twintPaymentService.getTwintPaymentUrl());
+        data.put("openUrl", "/api/orders/" + orderId + "/twint/open");
+        data.put("qrImageUrl", "/api/orders/" + orderId + "/twint/qr");
+        data.put("qrImageDataUri", qrDataUri);
+        return ResponseEntity.ok(data);
+    }
+
+    @GetMapping("/{orderId}/twint/open")
+    public ResponseEntity<Void> openTwintPayment(@PathVariable UUID orderId) {
+        if (!orderRepo.existsById(orderId)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.status(302)
+                .location(URI.create(twintPaymentService.getTwintPaymentUrl()))
+                .build();
+    }
+
+    @GetMapping("/{orderId}/twint/qr")
+    public ResponseEntity<byte[]> getTwintQr(
+            @PathVariable UUID orderId,
+            @RequestParam(defaultValue = "320") int size
+    ) {
+        if (!orderRepo.existsById(orderId)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        int normalizedSize = Math.max(200, Math.min(size, 600));
+        byte[] png = twintPaymentService.generateQrPng(normalizedSize);
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.IMAGE_PNG)
+                .body(png);
+    }
+    
+    private String getExtension(String filename) {
+        if (filename == null) return "stl";
+        int i = filename.lastIndexOf('.');
+        if (i > 0) {
+            return filename.substring(i + 1);
+        }
+        return "stl";
+    }
+
+    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.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

@@ -22,15 +22,17 @@ public class QuoteController {
     private final SlicerService slicerService;
     private final QuoteCalculator quoteCalculator;
     private final PrinterMachineRepository machineRepo;
+    private final com.printcalculator.service.ClamAVService clamAVService;
 
     // 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) {
+    public QuoteController(SlicerService slicerService, QuoteCalculator quoteCalculator, PrinterMachineRepository machineRepo, com.printcalculator.service.ClamAVService clamAVService) {
         this.slicerService = slicerService;
         this.quoteCalculator = quoteCalculator;
         this.machineRepo = machineRepo;
+        this.clamAVService = clamAVService;
     }
 
     @PostMapping("/api/quote")
@@ -99,6 +101,9 @@ public class QuoteController {
             return ResponseEntity.badRequest().build();
         }
 
+        // Scan for virus
+        clamAVService.scan(file.getInputStream());
+
         // Fetch Default Active Machine
         PrinterMachine machine = machineRepo.findFirstByIsActiveTrue()
                 .orElseThrow(() -> new IOException("No active printer found in database"));

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

@@ -0,0 +1,350 @@
+package com.printcalculator.controller;
+
+import com.printcalculator.entity.PrinterMachine;
+import com.printcalculator.entity.QuoteLineItem;
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.model.PrintStats;
+import com.printcalculator.model.QuoteResult;
+import com.printcalculator.repository.PrinterMachineRepository;
+import com.printcalculator.repository.QuoteLineItemRepository;
+import com.printcalculator.repository.QuoteSessionRepository;
+import com.printcalculator.service.QuoteCalculator;
+import com.printcalculator.service.SlicerService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+
+@RestController
+@RequestMapping("/api/quote-sessions")
+
+public class QuoteSessionController {
+
+    private final QuoteSessionRepository sessionRepo;
+    private final QuoteLineItemRepository lineItemRepo;
+    private final SlicerService slicerService;
+    private final QuoteCalculator quoteCalculator;
+    private final PrinterMachineRepository machineRepo;
+    private final com.printcalculator.repository.PricingPolicyRepository pricingRepo;
+    private final com.printcalculator.service.ClamAVService clamAVService;
+
+    // Defaults
+    private static final String DEFAULT_FILAMENT = "pla_basic";
+    private static final String DEFAULT_PROCESS = "standard";
+
+    public QuoteSessionController(QuoteSessionRepository sessionRepo,
+                                  QuoteLineItemRepository lineItemRepo,
+                                  SlicerService slicerService,
+                                  QuoteCalculator quoteCalculator,
+                                  PrinterMachineRepository machineRepo,
+                                  com.printcalculator.repository.PricingPolicyRepository pricingRepo,
+                                  com.printcalculator.service.ClamAVService clamAVService) {
+        this.sessionRepo = sessionRepo;
+        this.lineItemRepo = lineItemRepo;
+        this.slicerService = slicerService;
+        this.quoteCalculator = quoteCalculator;
+        this.machineRepo = machineRepo;
+        this.pricingRepo = pricingRepo;
+        this.clamAVService = clamAVService;
+    }
+
+    // 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_basic"); 
+        session.setSupportsEnabled(false);
+        session.setCreatedAt(OffsetDateTime.now());
+        session.setExpiresAt(OffsetDateTime.now().plusDays(30)); 
+        
+        var policy = pricingRepo.findFirstByIsActiveTrueOrderByValidFromDesc();
+        session.setSetupCostChf(policy != null ? policy.getFixedJobFeeChf() : BigDecimal.ZERO);
+        
+        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 {
+        QuoteSession session = sessionRepo.findById(id)
+                .orElseThrow(() -> new RuntimeException("Session not found"));
+
+        QuoteLineItem item = 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}
+        String storageDir = "storage_quotes/" + session.getId();
+        Files.createDirectories(Paths.get(storageDir));
+        
+        String originalFilename = file.getOriginalFilename();
+        String ext = originalFilename != null && originalFilename.contains(".") 
+                     ? originalFilename.substring(originalFilename.lastIndexOf(".")) 
+                     : ".stl";
+        
+        String storedFilename = UUID.randomUUID() + ext;
+        Path persistentPath = Paths.get(storageDir, storedFilename);
+        
+        // Save file
+        Files.copy(file.getInputStream(), persistentPath);
+
+        try {
+            // Apply Basic/Advanced Logic
+            applyPrintSettings(settings);
+
+            // REAL SLICING
+            // 1. Pick Machine (default to first active or specific)
+            PrinterMachine machine = machineRepo.findFirstByIsActiveTrue()
+                    .orElseThrow(() -> new RuntimeException("No active printer found"));
+            
+            // 2. Pick Profiles
+            String machineProfile = machine.getPrinterDisplayName(); // e.g. "Bambu Lab A1 0.4 nozzle"
+            // If the display name doesn't match the json profile name, we might need a mapping key in DB.
+            // For now assuming display name works or we use a tough default
+             machineProfile = "Bambu Lab A1 0.4 nozzle"; // Force known good for now? Or use DB field if exists. 
+             // Ideally: machine.getSlicerProfileName();
+            
+            String filamentProfile = "Generic " + (settings.getMaterial() != null ? settings.getMaterial().toUpperCase() : "PLA");
+            // Mapping: "pla_basic" -> "Generic PLA", "petg_basic" -> "Generic PETG"
+            if (settings.getMaterial() != null) {
+                if (settings.getMaterial().toLowerCase().contains("pla")) filamentProfile = "Generic PLA";
+                else if (settings.getMaterial().toLowerCase().contains("petg")) filamentProfile = "Generic PETG";
+                else if (settings.getMaterial().toLowerCase().contains("tpu")) filamentProfile = "Generic TPU";
+                else if (settings.getMaterial().toLowerCase().contains("abs")) filamentProfile = "Generic ABS";
+            }
+
+            String processProfile = "0.20mm Standard @BBL A1"; 
+            // Mapping quality to process
+            // "standard" -> "0.20mm Standard @BBL A1"
+            // "draft" -> "0.28mm Extra Draft @BBL A1"
+            // "high" -> "0.12mm Fine @BBL A1" (approx names, need to be exact for Orca)
+            // Let's use robust defaults or simple overrides
+            if (settings.getLayerHeight() != null) {
+                 if (settings.getLayerHeight() >= 0.28) processProfile = "0.28mm Extra Draft @BBL A1";
+                 else if (settings.getLayerHeight() <= 0.12) processProfile = "0.12mm Fine @BBL A1";
+            }
+            
+            // 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
+            );
+            
+            // 4. Calculate Quote
+            QuoteResult result = quoteCalculator.calculate(stats, machine.getPrinterDisplayName(), filamentProfile);
+
+            // 5. Create Line Item
+            QuoteLineItem item = new QuoteLineItem();
+            item.setQuoteSession(session);
+            item.setOriginalFilename(file.getOriginalFilename());
+            item.setStoredPath(persistentPath.toString()); // SAVE PATH
+            item.setQuantity(1);
+            item.setColorCode(settings.getColor() != null ? settings.getColor() : "#FFFFFF");
+            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() - result.getSetupCost()); // Approximation? 
+            // Better: QuoteResult could expose detailed breakdown. For now just storing what we have.
+            breakdown.put("setup_fee", result.getSetupCost());
+            item.setPricingBreakdown(breakdown);
+            
+            // Dimensions
+            // Cannot get bb from GCodeParser yet? 
+            // If GCodeParser doesn't return size, we might defaults or 0.
+            // Stats has filament used. 
+            // Let's set dummy for now or upgrade parser later.
+            item.setBoundingBoxXMm(BigDecimal.ZERO);
+            item.setBoundingBoxYMm(BigDecimal.ZERO);
+            item.setBoundingBoxZMm(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(20.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");
+        }
+    }
+
+    // 3. Update Line Item
+    @PatchMapping("/line-items/{lineItemId}")
+    @Transactional
+    public ResponseEntity<QuoteLineItem> updateLineItem(
+            @PathVariable UUID lineItemId,
+            @RequestBody Map<String, Object> updates
+    ) {
+        QuoteLineItem item = lineItemRepo.findById(lineItemId)
+                .orElseThrow(() -> new RuntimeException("Item not found"));
+        
+        if (updates.containsKey("quantity")) {
+            item.setQuantity((Integer) updates.get("quantity"));
+        }
+        if (updates.containsKey("color_code")) {
+            item.setColorCode((String) updates.get("color_code"));
+        }
+        
+        // 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?
+        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
+        BigDecimal itemsTotal = BigDecimal.ZERO;
+        for (QuoteLineItem item : items) {
+            BigDecimal lineTotal = item.getUnitPriceChf().multiply(BigDecimal.valueOf(item.getQuantity()));
+            itemsTotal = itemsTotal.add(lineTotal);
+        }
+        
+        BigDecimal setupFee = session.getSetupCostChf() != null ? session.getSetupCostChf() : BigDecimal.ZERO;
+        BigDecimal grandTotal = itemsTotal.add(setupFee);
+        
+        Map<String, Object> response = new HashMap<>();
+        response.put("session", session);
+        response.put("items", items);
+        response.put("itemsTotalChf", itemsTotal);
+        response.put("grandTotalChf", grandTotal);
+        
+        return ResponseEntity.ok(response);
+    }
+
+    // 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 {
+        QuoteLineItem item = lineItemRepo.findById(lineItemId)
+                .orElseThrow(() -> new RuntimeException("Item not found"));
+
+        if (!item.getQuoteSession().getId().equals(sessionId)) {
+            return ResponseEntity.badRequest().build();
+        }
+
+        if (item.getStoredPath() == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        Path path = Paths.get(item.getStoredPath());
+        if (!Files.exists(path)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        org.springframework.core.io.Resource resource = new org.springframework.core.io.UrlResource(path.toUri());
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .header(org.springframework.http.HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + item.getOriginalFilename() + "\"")
+                .body(resource);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.printcalculator.dto;
+
+import lombok.Data;
+
+@Data
+public class AddressDto {
+    private String firstName;
+    private String lastName;
+    private String companyName;
+    private String contactPerson;
+    private String addressLine1;
+    private String addressLine2;
+    private String zip;
+    private String city;
+    private String countryCode;
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.dto;
+
+import lombok.Data;
+
+@Data
+public class CreateOrderRequest {
+    private CustomerDto customer;
+    private AddressDto billingAddress;
+    private AddressDto shippingAddress;
+    private boolean shippingSameAsBilling;
+}

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

@@ -0,0 +1,10 @@
+package com.printcalculator.dto;
+
+import lombok.Data;
+
+@Data
+public class CustomerDto {
+    private String email;
+    private String phone;
+    private String customerType; // "PRIVATE", "BUSINESS"
+}

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

@@ -0,0 +1,86 @@
+package com.printcalculator.dto;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class OrderDto {
+    private UUID id;
+    private String orderNumber;
+    private String status;
+    private String paymentStatus;
+    private String paymentMethod;
+    private String customerEmail;
+    private String customerPhone;
+    private String billingCustomerType;
+    private AddressDto billingAddress;
+    private AddressDto shippingAddress;
+    private Boolean shippingSameAsBilling;
+    private String currency;
+    private BigDecimal setupCostChf;
+    private BigDecimal shippingCostChf;
+    private BigDecimal discountChf;
+    private BigDecimal subtotalChf;
+    private BigDecimal totalChf;
+    private OffsetDateTime createdAt;
+    private List<OrderItemDto> items;
+
+    // Getters and Setters
+    public UUID getId() { return id; }
+    public void setId(UUID id) { this.id = id; }
+
+    public String getOrderNumber() { return orderNumber; }
+    public void setOrderNumber(String orderNumber) { this.orderNumber = orderNumber; }
+
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+
+    public String getPaymentStatus() { return paymentStatus; }
+    public void setPaymentStatus(String paymentStatus) { this.paymentStatus = paymentStatus; }
+
+    public String getPaymentMethod() { return paymentMethod; }
+    public void setPaymentMethod(String paymentMethod) { this.paymentMethod = paymentMethod; }
+
+    public String getCustomerEmail() { return customerEmail; }
+    public void setCustomerEmail(String customerEmail) { this.customerEmail = customerEmail; }
+
+    public String getCustomerPhone() { return customerPhone; }
+    public void setCustomerPhone(String customerPhone) { this.customerPhone = customerPhone; }
+
+    public String getBillingCustomerType() { return billingCustomerType; }
+    public void setBillingCustomerType(String billingCustomerType) { this.billingCustomerType = billingCustomerType; }
+
+    public AddressDto getBillingAddress() { return billingAddress; }
+    public void setBillingAddress(AddressDto billingAddress) { this.billingAddress = billingAddress; }
+
+    public AddressDto getShippingAddress() { return shippingAddress; }
+    public void setShippingAddress(AddressDto shippingAddress) { this.shippingAddress = shippingAddress; }
+
+    public Boolean getShippingSameAsBilling() { return shippingSameAsBilling; }
+    public void setShippingSameAsBilling(Boolean shippingSameAsBilling) { this.shippingSameAsBilling = shippingSameAsBilling; }
+
+    public String getCurrency() { return currency; }
+    public void setCurrency(String currency) { this.currency = currency; }
+
+    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 getDiscountChf() { return discountChf; }
+    public void setDiscountChf(BigDecimal discountChf) { this.discountChf = discountChf; }
+
+    public BigDecimal getSubtotalChf() { return subtotalChf; }
+    public void setSubtotalChf(BigDecimal subtotalChf) { this.subtotalChf = subtotalChf; }
+
+    public BigDecimal getTotalChf() { return totalChf; }
+    public void setTotalChf(BigDecimal totalChf) { this.totalChf = totalChf; }
+
+    public OffsetDateTime getCreatedAt() { return createdAt; }
+    public void setCreatedAt(OffsetDateTime createdAt) { this.createdAt = createdAt; }
+
+    public List<OrderItemDto> getItems() { return items; }
+    public void setItems(List<OrderItemDto> items) { this.items = items; }
+}

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

@@ -0,0 +1,44 @@
+package com.printcalculator.dto;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+public class OrderItemDto {
+    private UUID id;
+    private String originalFilename;
+    private String materialCode;
+    private String colorCode;
+    private Integer quantity;
+    private Integer printTimeSeconds;
+    private BigDecimal materialGrams;
+    private BigDecimal unitPriceChf;
+    private BigDecimal lineTotalChf;
+
+    // Getters and Setters
+    public UUID getId() { return id; }
+    public void setId(UUID id) { this.id = id; }
+
+    public String getOriginalFilename() { return originalFilename; }
+    public void setOriginalFilename(String originalFilename) { this.originalFilename = originalFilename; }
+
+    public String getMaterialCode() { return materialCode; }
+    public void setMaterialCode(String materialCode) { this.materialCode = materialCode; }
+
+    public String getColorCode() { return colorCode; }
+    public void setColorCode(String colorCode) { this.colorCode = colorCode; }
+
+    public Integer getQuantity() { return quantity; }
+    public void setQuantity(Integer quantity) { this.quantity = quantity; }
+
+    public Integer getPrintTimeSeconds() { return printTimeSeconds; }
+    public void setPrintTimeSeconds(Integer printTimeSeconds) { this.printTimeSeconds = printTimeSeconds; }
+
+    public BigDecimal getMaterialGrams() { return materialGrams; }
+    public void setMaterialGrams(BigDecimal materialGrams) { this.materialGrams = materialGrams; }
+
+    public BigDecimal getUnitPriceChf() { return unitPriceChf; }
+    public void setUnitPriceChf(BigDecimal unitPriceChf) { this.unitPriceChf = unitPriceChf; }
+
+    public BigDecimal getLineTotalChf() { return lineTotalChf; }
+    public void setLineTotalChf(BigDecimal lineTotalChf) { this.lineTotalChf = lineTotalChf; }
+}

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

@@ -0,0 +1,23 @@
+package com.printcalculator.dto;
+
+import lombok.Data;
+
+@Data
+public class PrintSettingsDto {
+    // Mode: "BASIC" or "ADVANCED"
+    private String complexityMode;
+    
+    // Common
+    private String material; // e.g. "PLA", "PETG"
+    private String color;    // e.g. "White", "#FFFFFF"
+    
+    // Basic Mode
+    private String quality;  // "draft", "standard", "high"
+    
+    // Advanced Mode (Optional in Basic)
+    private Double layerHeight;
+    private Double infillDensity;
+    private String infillPattern;
+    private Boolean supportsEnabled;
+    private String notes;
+}

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

@@ -0,0 +1,15 @@
+package com.printcalculator.dto;
+
+import lombok.Data;
+
+@Data
+public class QuoteRequestDto {
+    private String requestType; // "PRINT_SERVICE" or "DESIGN_SERVICE"
+    private String customerType; // "PRIVATE" or "BUSINESS"
+    private String email;
+    private String phone;
+    private String name;
+    private String companyName;
+    private String contactPerson;
+    private String message;
+}

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

@@ -0,0 +1,149 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "custom_quote_requests", indexes = {@Index(name = "ix_custom_quote_requests_status",
+        columnList = "status")})
+public class CustomQuoteRequest {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "request_id", nullable = false)
+    private UUID id;
+
+    @Column(name = "request_type", nullable = false, length = Integer.MAX_VALUE)
+    private String requestType;
+
+    @Column(name = "customer_type", nullable = false, length = Integer.MAX_VALUE)
+    private String customerType;
+
+    @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
+    private String email;
+
+    @Column(name = "phone", length = Integer.MAX_VALUE)
+    private String phone;
+
+    @Column(name = "name", length = Integer.MAX_VALUE)
+    private String name;
+
+    @Column(name = "company_name", length = Integer.MAX_VALUE)
+    private String companyName;
+
+    @Column(name = "contact_person", length = Integer.MAX_VALUE)
+    private String contactPerson;
+
+    @Column(name = "message", nullable = false, length = Integer.MAX_VALUE)
+    private String message;
+
+    @Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
+    private String status;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public String getCustomerType() {
+        return customerType;
+    }
+
+    public void setCustomerType(String customerType) {
+        this.customerType = customerType;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getContactPerson() {
+        return contactPerson;
+    }
+
+    public void setContactPerson(String contactPerson) {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+}

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

@@ -0,0 +1,121 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "custom_quote_request_attachments", indexes = {@Index(name = "ix_custom_quote_attachments_request",
+        columnList = "request_id")})
+public class CustomQuoteRequestAttachment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "attachment_id", nullable = false)
+    private UUID id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "request_id", nullable = false)
+    private CustomQuoteRequest request;
+
+    @Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
+    private String originalFilename;
+
+    @Column(name = "stored_relative_path", nullable = false, length = Integer.MAX_VALUE)
+    private String storedRelativePath;
+
+    @Column(name = "stored_filename", nullable = false, length = Integer.MAX_VALUE)
+    private String storedFilename;
+
+    @Column(name = "file_size_bytes")
+    private Long fileSizeBytes;
+
+    @Column(name = "mime_type", length = Integer.MAX_VALUE)
+    private String mimeType;
+
+    @Column(name = "sha256_hex", length = Integer.MAX_VALUE)
+    private String sha256Hex;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public CustomQuoteRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(CustomQuoteRequest request) {
+        this.request = request;
+    }
+
+    public String getOriginalFilename() {
+        return originalFilename;
+    }
+
+    public void setOriginalFilename(String originalFilename) {
+        this.originalFilename = originalFilename;
+    }
+
+    public String getStoredRelativePath() {
+        return storedRelativePath;
+    }
+
+    public void setStoredRelativePath(String storedRelativePath) {
+        this.storedRelativePath = storedRelativePath;
+    }
+
+    public String getStoredFilename() {
+        return storedFilename;
+    }
+
+    public void setStoredFilename(String storedFilename) {
+        this.storedFilename = storedFilename;
+    }
+
+    public Long getFileSizeBytes() {
+        return fileSizeBytes;
+    }
+
+    public void setFileSizeBytes(Long fileSizeBytes) {
+        this.fileSizeBytes = fileSizeBytes;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getSha256Hex() {
+        return sha256Hex;
+    }
+
+    public void setSha256Hex(String sha256Hex) {
+        this.sha256Hex = sha256Hex;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public void setCustomQuoteRequest(CustomQuoteRequest request) {
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "customers")
+public class Customer {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "customer_id", nullable = false)
+    private UUID id;
+
+    @Column(name = "customer_type", nullable = false, length = Integer.MAX_VALUE)
+    private String customerType;
+
+    @Column(name = "email", nullable = false, length = Integer.MAX_VALUE)
+    private String email;
+
+    @Column(name = "phone", length = Integer.MAX_VALUE)
+    private String phone;
+
+    @Column(name = "first_name", length = Integer.MAX_VALUE)
+    private String firstName;
+
+    @Column(name = "last_name", length = Integer.MAX_VALUE)
+    private String lastName;
+
+    @Column(name = "company_name", length = Integer.MAX_VALUE)
+    private String companyName;
+
+    @Column(name = "contact_person", length = Integer.MAX_VALUE)
+    private String contactPerson;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getCustomerType() {
+        return customerType;
+    }
+
+    public void setCustomerType(String customerType) {
+        this.customerType = customerType;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getContactPerson() {
+        return contactPerson;
+    }
+
+    public void setContactPerson(String contactPerson) {
+        this.contactPerson = contactPerson;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+}

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

@@ -0,0 +1,423 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "orders", indexes = {@Index(name = "ix_orders_status",
+        columnList = "status")})
+public class Order {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "order_id", nullable = false)
+    private UUID id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "source_quote_session_id")
+    private QuoteSession sourceQuoteSession;
+
+    @Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
+    private String status;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "customer_id")
+    private Customer customer;
+
+    @Column(name = "customer_email", nullable = false, length = Integer.MAX_VALUE)
+    private String customerEmail;
+
+    @Column(name = "customer_phone", length = Integer.MAX_VALUE)
+    private String customerPhone;
+
+    @Column(name = "billing_customer_type", nullable = false, length = Integer.MAX_VALUE)
+    private String billingCustomerType;
+
+    @Column(name = "billing_first_name", length = Integer.MAX_VALUE)
+    private String billingFirstName;
+
+    @Column(name = "billing_last_name", length = Integer.MAX_VALUE)
+    private String billingLastName;
+
+    @Column(name = "billing_company_name", length = Integer.MAX_VALUE)
+    private String billingCompanyName;
+
+    @Column(name = "billing_contact_person", length = Integer.MAX_VALUE)
+    private String billingContactPerson;
+
+    @Column(name = "billing_address_line1", nullable = false, length = Integer.MAX_VALUE)
+    private String billingAddressLine1;
+
+    @Column(name = "billing_address_line2", length = Integer.MAX_VALUE)
+    private String billingAddressLine2;
+
+    @Column(name = "billing_zip", nullable = false, length = Integer.MAX_VALUE)
+    private String billingZip;
+
+    @Column(name = "billing_city", nullable = false, length = Integer.MAX_VALUE)
+    private String billingCity;
+
+    @ColumnDefault("'CH'")
+    @Column(name = "billing_country_code", nullable = false, length = 2)
+    private String billingCountryCode;
+
+    @ColumnDefault("true")
+    @Column(name = "shipping_same_as_billing", nullable = false)
+    private Boolean shippingSameAsBilling;
+
+    @Column(name = "shipping_first_name", length = Integer.MAX_VALUE)
+    private String shippingFirstName;
+
+    @Column(name = "shipping_last_name", length = Integer.MAX_VALUE)
+    private String shippingLastName;
+
+    @Column(name = "shipping_company_name", length = Integer.MAX_VALUE)
+    private String shippingCompanyName;
+
+    @Column(name = "shipping_contact_person", length = Integer.MAX_VALUE)
+    private String shippingContactPerson;
+
+    @Column(name = "shipping_address_line1", length = Integer.MAX_VALUE)
+    private String shippingAddressLine1;
+
+    @Column(name = "shipping_address_line2", length = Integer.MAX_VALUE)
+    private String shippingAddressLine2;
+
+    @Column(name = "shipping_zip", length = Integer.MAX_VALUE)
+    private String shippingZip;
+
+    @Column(name = "shipping_city", length = Integer.MAX_VALUE)
+    private String shippingCity;
+
+    @Column(name = "shipping_country_code", length = 2)
+    private String shippingCountryCode;
+
+    @ColumnDefault("'CHF'")
+    @Column(name = "currency", nullable = false, length = 3)
+    private String currency;
+
+    @ColumnDefault("0.00")
+    @Column(name = "setup_cost_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal setupCostChf;
+
+    @ColumnDefault("0.00")
+    @Column(name = "shipping_cost_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal shippingCostChf;
+
+    @ColumnDefault("0.00")
+    @Column(name = "discount_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal discountChf;
+
+    @ColumnDefault("0.00")
+    @Column(name = "subtotal_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal subtotalChf;
+
+    @ColumnDefault("0.00")
+    @Column(name = "total_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal totalChf;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "paid_at")
+    private OffsetDateTime paidAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    @Transient
+    public String getOrderNumber() {
+        if (id == null) {
+            return null;
+        }
+        String rawId = id.toString();
+        int dashIndex = rawId.indexOf('-');
+        return dashIndex > 0 ? rawId.substring(0, dashIndex) : rawId;
+    }
+
+    public QuoteSession getSourceQuoteSession() {
+        return sourceQuoteSession;
+    }
+
+    public void setSourceQuoteSession(QuoteSession sourceQuoteSession) {
+        this.sourceQuoteSession = sourceQuoteSession;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Customer getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
+    }
+
+    public String getCustomerEmail() {
+        return customerEmail;
+    }
+
+    public void setCustomerEmail(String customerEmail) {
+        this.customerEmail = customerEmail;
+    }
+
+    public String getCustomerPhone() {
+        return customerPhone;
+    }
+
+    public void setCustomerPhone(String customerPhone) {
+        this.customerPhone = customerPhone;
+    }
+
+    public String getBillingCustomerType() {
+        return billingCustomerType;
+    }
+
+    public void setBillingCustomerType(String billingCustomerType) {
+        this.billingCustomerType = billingCustomerType;
+    }
+
+    public String getBillingFirstName() {
+        return billingFirstName;
+    }
+
+    public void setBillingFirstName(String billingFirstName) {
+        this.billingFirstName = billingFirstName;
+    }
+
+    public String getBillingLastName() {
+        return billingLastName;
+    }
+
+    public void setBillingLastName(String billingLastName) {
+        this.billingLastName = billingLastName;
+    }
+
+    public String getBillingCompanyName() {
+        return billingCompanyName;
+    }
+
+    public void setBillingCompanyName(String billingCompanyName) {
+        this.billingCompanyName = billingCompanyName;
+    }
+
+    public String getBillingContactPerson() {
+        return billingContactPerson;
+    }
+
+    public void setBillingContactPerson(String billingContactPerson) {
+        this.billingContactPerson = billingContactPerson;
+    }
+
+    public String getBillingAddressLine1() {
+        return billingAddressLine1;
+    }
+
+    public void setBillingAddressLine1(String billingAddressLine1) {
+        this.billingAddressLine1 = billingAddressLine1;
+    }
+
+    public String getBillingAddressLine2() {
+        return billingAddressLine2;
+    }
+
+    public void setBillingAddressLine2(String billingAddressLine2) {
+        this.billingAddressLine2 = billingAddressLine2;
+    }
+
+    public String getBillingZip() {
+        return billingZip;
+    }
+
+    public void setBillingZip(String billingZip) {
+        this.billingZip = billingZip;
+    }
+
+    public String getBillingCity() {
+        return billingCity;
+    }
+
+    public void setBillingCity(String billingCity) {
+        this.billingCity = billingCity;
+    }
+
+    public String getBillingCountryCode() {
+        return billingCountryCode;
+    }
+
+    public void setBillingCountryCode(String billingCountryCode) {
+        this.billingCountryCode = billingCountryCode;
+    }
+
+    public Boolean getShippingSameAsBilling() {
+        return shippingSameAsBilling;
+    }
+
+    public void setShippingSameAsBilling(Boolean shippingSameAsBilling) {
+        this.shippingSameAsBilling = shippingSameAsBilling;
+    }
+
+    public String getShippingFirstName() {
+        return shippingFirstName;
+    }
+
+    public void setShippingFirstName(String shippingFirstName) {
+        this.shippingFirstName = shippingFirstName;
+    }
+
+    public String getShippingLastName() {
+        return shippingLastName;
+    }
+
+    public void setShippingLastName(String shippingLastName) {
+        this.shippingLastName = shippingLastName;
+    }
+
+    public String getShippingCompanyName() {
+        return shippingCompanyName;
+    }
+
+    public void setShippingCompanyName(String shippingCompanyName) {
+        this.shippingCompanyName = shippingCompanyName;
+    }
+
+    public String getShippingContactPerson() {
+        return shippingContactPerson;
+    }
+
+    public void setShippingContactPerson(String shippingContactPerson) {
+        this.shippingContactPerson = shippingContactPerson;
+    }
+
+    public String getShippingAddressLine1() {
+        return shippingAddressLine1;
+    }
+
+    public void setShippingAddressLine1(String shippingAddressLine1) {
+        this.shippingAddressLine1 = shippingAddressLine1;
+    }
+
+    public String getShippingAddressLine2() {
+        return shippingAddressLine2;
+    }
+
+    public void setShippingAddressLine2(String shippingAddressLine2) {
+        this.shippingAddressLine2 = shippingAddressLine2;
+    }
+
+    public String getShippingZip() {
+        return shippingZip;
+    }
+
+    public void setShippingZip(String shippingZip) {
+        this.shippingZip = shippingZip;
+    }
+
+    public String getShippingCity() {
+        return shippingCity;
+    }
+
+    public void setShippingCity(String shippingCity) {
+        this.shippingCity = shippingCity;
+    }
+
+    public String getShippingCountryCode() {
+        return shippingCountryCode;
+    }
+
+    public void setShippingCountryCode(String shippingCountryCode) {
+        this.shippingCountryCode = shippingCountryCode;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    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 getDiscountChf() {
+        return discountChf;
+    }
+
+    public void setDiscountChf(BigDecimal discountChf) {
+        this.discountChf = discountChf;
+    }
+
+    public BigDecimal getSubtotalChf() {
+        return subtotalChf;
+    }
+
+    public void setSubtotalChf(BigDecimal subtotalChf) {
+        this.subtotalChf = subtotalChf;
+    }
+
+    public BigDecimal getTotalChf() {
+        return totalChf;
+    }
+
+    public void setTotalChf(BigDecimal totalChf) {
+        this.totalChf = totalChf;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public OffsetDateTime getPaidAt() {
+        return paidAt;
+    }
+
+    public void setPaidAt(OffsetDateTime paidAt) {
+        this.paidAt = paidAt;
+    }
+
+}

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

@@ -0,0 +1,208 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "order_items", indexes = {@Index(name = "ix_order_items_order",
+        columnList = "order_id")})
+public class OrderItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "order_item_id", nullable = false)
+    private UUID id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "order_id", nullable = false)
+    private Order order;
+
+    @Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
+    private String originalFilename;
+
+    @Column(name = "stored_relative_path", nullable = false, length = Integer.MAX_VALUE)
+    private String storedRelativePath;
+
+    @Column(name = "stored_filename", nullable = false, length = Integer.MAX_VALUE)
+    private String storedFilename;
+
+    @Column(name = "file_size_bytes")
+    private Long fileSizeBytes;
+
+    @Column(name = "mime_type", length = Integer.MAX_VALUE)
+    private String mimeType;
+
+    @Column(name = "sha256_hex", length = Integer.MAX_VALUE)
+    private String sha256Hex;
+
+    @Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
+    private String materialCode;
+
+    @Column(name = "color_code", length = Integer.MAX_VALUE)
+    private String colorCode;
+
+    @ColumnDefault("1")
+    @Column(name = "quantity", nullable = false)
+    private Integer quantity;
+
+    @Column(name = "print_time_seconds")
+    private Integer printTimeSeconds;
+
+    @Column(name = "material_grams", precision = 12, scale = 2)
+    private BigDecimal materialGrams;
+
+    @Column(name = "unit_price_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal unitPriceChf;
+
+    @Column(name = "line_total_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal lineTotalChf;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @PrePersist
+    private void onCreate() {
+        if (createdAt == null) {
+            createdAt = OffsetDateTime.now();
+        }
+        if (quantity == null) {
+            quantity = 1;
+        }
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public Order getOrder() {
+        return order;
+    }
+
+    public void setOrder(Order order) {
+        this.order = order;
+    }
+
+    public String getOriginalFilename() {
+        return originalFilename;
+    }
+
+    public void setOriginalFilename(String originalFilename) {
+        this.originalFilename = originalFilename;
+    }
+
+    public String getStoredRelativePath() {
+        return storedRelativePath;
+    }
+
+    public void setStoredRelativePath(String storedRelativePath) {
+        this.storedRelativePath = storedRelativePath;
+    }
+
+    public String getStoredFilename() {
+        return storedFilename;
+    }
+
+    public void setStoredFilename(String storedFilename) {
+        this.storedFilename = storedFilename;
+    }
+
+    public Long getFileSizeBytes() {
+        return fileSizeBytes;
+    }
+
+    public void setFileSizeBytes(Long fileSizeBytes) {
+        this.fileSizeBytes = fileSizeBytes;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getSha256Hex() {
+        return sha256Hex;
+    }
+
+    public void setSha256Hex(String sha256Hex) {
+        this.sha256Hex = sha256Hex;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getColorCode() {
+        return colorCode;
+    }
+
+    public void setColorCode(String colorCode) {
+        this.colorCode = colorCode;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    public Integer getPrintTimeSeconds() {
+        return printTimeSeconds;
+    }
+
+    public void setPrintTimeSeconds(Integer printTimeSeconds) {
+        this.printTimeSeconds = printTimeSeconds;
+    }
+
+    public BigDecimal getMaterialGrams() {
+        return materialGrams;
+    }
+
+    public void setMaterialGrams(BigDecimal materialGrams) {
+        this.materialGrams = materialGrams;
+    }
+
+    public BigDecimal getUnitPriceChf() {
+        return unitPriceChf;
+    }
+
+    public void setUnitPriceChf(BigDecimal unitPriceChf) {
+        this.unitPriceChf = unitPriceChf;
+    }
+
+    public BigDecimal getLineTotalChf() {
+        return lineTotalChf;
+    }
+
+    public void setLineTotalChf(BigDecimal lineTotalChf) {
+        this.lineTotalChf = lineTotalChf;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+}

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

@@ -0,0 +1,157 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "payments", indexes = {
+        @Index(name = "ix_payments_order",
+                columnList = "order_id"),
+        @Index(name = "ix_payments_reference",
+                columnList = "payment_reference")})
+public class Payment {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "payment_id", nullable = false)
+    private UUID id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "order_id", nullable = false)
+    private Order order;
+
+    @Column(name = "method", nullable = false, length = Integer.MAX_VALUE)
+    private String method;
+
+    @Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
+    private String status;
+
+    @ColumnDefault("'CHF'")
+    @Column(name = "currency", nullable = false, length = 3)
+    private String currency;
+
+    @Column(name = "amount_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal amountChf;
+
+    @Column(name = "payment_reference", length = Integer.MAX_VALUE)
+    private String paymentReference;
+
+    @Column(name = "provider_transaction_id", length = Integer.MAX_VALUE)
+    private String providerTransactionId;
+
+    @Column(name = "qr_payload", length = Integer.MAX_VALUE)
+    private String qrPayload;
+
+    @ColumnDefault("now()")
+    @Column(name = "initiated_at", nullable = false)
+    private OffsetDateTime initiatedAt;
+
+    @Column(name = "reported_at")
+    private OffsetDateTime reportedAt;
+
+    @Column(name = "received_at")
+    private OffsetDateTime receivedAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public Order getOrder() {
+        return order;
+    }
+
+    public void setOrder(Order order) {
+        this.order = order;
+    }
+
+    public String getMethod() {
+        return method;
+    }
+
+    public void setMethod(String method) {
+        this.method = method;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public BigDecimal getAmountChf() {
+        return amountChf;
+    }
+
+    public void setAmountChf(BigDecimal amountChf) {
+        this.amountChf = amountChf;
+    }
+
+    public String getPaymentReference() {
+        return paymentReference;
+    }
+
+    public void setPaymentReference(String paymentReference) {
+        this.paymentReference = paymentReference;
+    }
+
+    public String getProviderTransactionId() {
+        return providerTransactionId;
+    }
+
+    public void setProviderTransactionId(String providerTransactionId) {
+        this.providerTransactionId = providerTransactionId;
+    }
+
+    public String getQrPayload() {
+        return qrPayload;
+    }
+
+    public void setQrPayload(String qrPayload) {
+        this.qrPayload = qrPayload;
+    }
+
+    public OffsetDateTime getInitiatedAt() {
+        return initiatedAt;
+    }
+
+    public void setInitiatedAt(OffsetDateTime initiatedAt) {
+        this.initiatedAt = initiatedAt;
+    }
+
+    public OffsetDateTime getReportedAt() {
+        return reportedAt;
+    }
+
+    public void setReportedAt(OffsetDateTime reportedAt) {
+        this.reportedAt = reportedAt;
+    }
+
+    public OffsetDateTime getReceivedAt() {
+        return receivedAt;
+    }
+
+    public void setReceivedAt(OffsetDateTime receivedAt) {
+        this.receivedAt = receivedAt;
+    }
+
+}

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

@@ -0,0 +1,215 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+import org.hibernate.type.SqlTypes;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.Map;
+import java.util.UUID;
+
+@Entity
+@Table(name = "quote_line_items", indexes = {@Index(name = "ix_quote_line_items_session",
+        columnList = "quote_session_id")})
+public class QuoteLineItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "quote_line_item_id", nullable = false)
+    private UUID id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JoinColumn(name = "quote_session_id", nullable = false)
+    @com.fasterxml.jackson.annotation.JsonIgnore
+    private QuoteSession quoteSession;
+
+    @Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
+    private String status;
+
+    @Column(name = "original_filename", nullable = false, length = Integer.MAX_VALUE)
+    private String originalFilename;
+
+    @ColumnDefault("1")
+    @Column(name = "quantity", nullable = false)
+    private Integer quantity;
+
+    @Column(name = "color_code", length = Integer.MAX_VALUE)
+    private String colorCode;
+
+    @Column(name = "bounding_box_x_mm", precision = 10, scale = 3)
+    private BigDecimal boundingBoxXMm;
+
+    @Column(name = "bounding_box_y_mm", precision = 10, scale = 3)
+    private BigDecimal boundingBoxYMm;
+
+    @Column(name = "bounding_box_z_mm", precision = 10, scale = 3)
+    private BigDecimal boundingBoxZMm;
+
+    @Column(name = "print_time_seconds")
+    private Integer printTimeSeconds;
+
+    @Column(name = "material_grams", precision = 12, scale = 2)
+    private BigDecimal materialGrams;
+
+    @Column(name = "unit_price_chf", precision = 12, scale = 2)
+    private BigDecimal unitPriceChf;
+
+    @JdbcTypeCode(SqlTypes.JSON)
+    @Column(name = "pricing_breakdown")
+    private Map<String, Object> pricingBreakdown;
+
+    @Column(name = "error_message", length = Integer.MAX_VALUE)
+    private String errorMessage;
+
+    @Column(name = "stored_path", length = Integer.MAX_VALUE)
+    private String storedPath;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @ColumnDefault("now()")
+    @Column(name = "updated_at", nullable = false)
+    private OffsetDateTime updatedAt;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public QuoteSession getQuoteSession() {
+        return quoteSession;
+    }
+
+    public void setQuoteSession(QuoteSession quoteSession) {
+        this.quoteSession = quoteSession;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOriginalFilename() {
+        return originalFilename;
+    }
+
+    public void setOriginalFilename(String originalFilename) {
+        this.originalFilename = originalFilename;
+    }
+
+    public Integer getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Integer quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getColorCode() {
+        return colorCode;
+    }
+
+    public void setColorCode(String colorCode) {
+        this.colorCode = colorCode;
+    }
+
+    public BigDecimal getBoundingBoxXMm() {
+        return boundingBoxXMm;
+    }
+
+    public void setBoundingBoxXMm(BigDecimal boundingBoxXMm) {
+        this.boundingBoxXMm = boundingBoxXMm;
+    }
+
+    public BigDecimal getBoundingBoxYMm() {
+        return boundingBoxYMm;
+    }
+
+    public void setBoundingBoxYMm(BigDecimal boundingBoxYMm) {
+        this.boundingBoxYMm = boundingBoxYMm;
+    }
+
+    public BigDecimal getBoundingBoxZMm() {
+        return boundingBoxZMm;
+    }
+
+    public void setBoundingBoxZMm(BigDecimal boundingBoxZMm) {
+        this.boundingBoxZMm = boundingBoxZMm;
+    }
+
+    public Integer getPrintTimeSeconds() {
+        return printTimeSeconds;
+    }
+
+    public void setPrintTimeSeconds(Integer printTimeSeconds) {
+        this.printTimeSeconds = printTimeSeconds;
+    }
+
+    public BigDecimal getMaterialGrams() {
+        return materialGrams;
+    }
+
+    public void setMaterialGrams(BigDecimal materialGrams) {
+        this.materialGrams = materialGrams;
+    }
+
+    public BigDecimal getUnitPriceChf() {
+        return unitPriceChf;
+    }
+
+    public void setUnitPriceChf(BigDecimal unitPriceChf) {
+        this.unitPriceChf = unitPriceChf;
+    }
+
+    public Map<String, Object> getPricingBreakdown() {
+        return pricingBreakdown;
+    }
+
+    public void setPricingBreakdown(Map<String, Object> pricingBreakdown) {
+        this.pricingBreakdown = pricingBreakdown;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public String getStoredPath() {
+        return storedPath;
+    }
+
+    public void setStoredPath(String storedPath) {
+        this.storedPath = storedPath;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(OffsetDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+}

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

@@ -0,0 +1,176 @@
+package com.printcalculator.entity;
+
+import jakarta.persistence.*;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+@Entity
+@Table(name = "quote_sessions", indexes = {
+        @Index(name = "ix_quote_sessions_status",
+                columnList = "status"),
+        @Index(name = "ix_quote_sessions_expires_at",
+                columnList = "expires_at")})
+public class QuoteSession {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "quote_session_id", nullable = false)
+    private UUID id;
+
+    @Column(name = "status", nullable = false, length = Integer.MAX_VALUE)
+    private String status;
+
+    @Column(name = "pricing_version", nullable = false, length = Integer.MAX_VALUE)
+    private String pricingVersion;
+
+    @Column(name = "material_code", nullable = false, length = Integer.MAX_VALUE)
+    private String materialCode;
+
+    @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_pattern", length = Integer.MAX_VALUE)
+    private String infillPattern;
+
+    @Column(name = "infill_percent")
+    private Integer infillPercent;
+
+    @ColumnDefault("false")
+    @Column(name = "supports_enabled", nullable = false)
+    private Boolean supportsEnabled;
+
+    @Column(name = "notes", length = Integer.MAX_VALUE)
+    private String notes;
+
+    @ColumnDefault("0.00")
+    @Column(name = "setup_cost_chf", nullable = false, precision = 12, scale = 2)
+    private BigDecimal setupCostChf;
+
+    @ColumnDefault("now()")
+    @Column(name = "created_at", nullable = false)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "expires_at", nullable = false)
+    private OffsetDateTime expiresAt;
+
+    @Column(name = "converted_order_id")
+    private UUID convertedOrderId;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getPricingVersion() {
+        return pricingVersion;
+    }
+
+    public void setPricingVersion(String pricingVersion) {
+        this.pricingVersion = pricingVersion;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    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 String getInfillPattern() {
+        return infillPattern;
+    }
+
+    public void setInfillPattern(String infillPattern) {
+        this.infillPattern = infillPattern;
+    }
+
+    public Integer getInfillPercent() {
+        return infillPercent;
+    }
+
+    public void setInfillPercent(Integer infillPercent) {
+        this.infillPercent = infillPercent;
+    }
+
+    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 BigDecimal getSetupCostChf() {
+        return setupCostChf;
+    }
+
+    public void setSetupCostChf(BigDecimal setupCostChf) {
+        this.setupCostChf = setupCostChf;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public OffsetDateTime getExpiresAt() {
+        return expiresAt;
+    }
+
+    public void setExpiresAt(OffsetDateTime expiresAt) {
+        this.expiresAt = expiresAt;
+    }
+
+    public UUID getConvertedOrderId() {
+        return convertedOrderId;
+    }
+
+    public void setConvertedOrderId(UUID convertedOrderId) {
+        this.convertedOrderId = convertedOrderId;
+    }
+
+}

backend/src/main/java/com/printcalculator/event/OrderCreatedEvent.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 OrderCreatedEvent extends ApplicationEvent {
+
+    private final Order order;
+
+    public OrderCreatedEvent(Object source, Order order) {
+        super(source);
+        this.order = order;
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.printcalculator.event;
+
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.Payment;
+import org.springframework.context.ApplicationEvent;
+
+public class PaymentReportedEvent extends ApplicationEvent {
+
+    private final Order order;
+    private final Payment payment;
+
+    public PaymentReportedEvent(Object source, Order order, Payment payment) {
+        super(source);
+        this.order = order;
+        this.payment = payment;
+    }
+
+    public Order getOrder() {
+        return order;
+    }
+
+    public Payment getPayment() {
+        return payment;
+    }
+}

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

@@ -0,0 +1,127 @@
+package com.printcalculator.event.listener;
+
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.Payment;
+import com.printcalculator.event.OrderCreatedEvent;
+import com.printcalculator.event.PaymentReportedEvent;
+import com.printcalculator.service.email.EmailNotificationService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class OrderEmailListener {
+
+    private final EmailNotificationService emailNotificationService;
+
+    @Value("${app.mail.admin.enabled:true}")
+    private boolean adminMailEnabled;
+
+    @Value("${app.mail.admin.address:}")
+    private String adminMailAddress;
+
+    @Value("${app.frontend.base-url:http://localhost:4200}")
+    private String frontendBaseUrl;
+
+    @Async
+    @EventListener
+    public void handleOrderCreatedEvent(OrderCreatedEvent event) {
+        Order order = event.getOrder();
+        log.info("Processing OrderCreatedEvent for order id: {}", order.getId());
+
+        try {
+            sendCustomerConfirmationEmail(order);
+            
+            if (adminMailEnabled && adminMailAddress != null && !adminMailAddress.isEmpty()) {
+                sendAdminNotificationEmail(order);
+            }
+        } catch (Exception e) {
+            log.error("Failed to process email notifications for order id: {}", order.getId(), e);
+        }
+    }
+
+    @Async
+    @EventListener
+    public void handlePaymentReportedEvent(PaymentReportedEvent event) {
+        Order order = event.getOrder();
+        log.info("Processing PaymentReportedEvent for order id: {}", order.getId());
+
+        try {
+            sendPaymentReportedEmail(order);
+        } catch (Exception e) {
+            log.error("Failed to send payment reported email for order id: {}", order.getId(), e);
+        }
+    }
+
+    private void sendCustomerConfirmationEmail(Order order) {
+        Map<String, Object> templateData = new HashMap<>();
+        templateData.put("customerName", order.getCustomer().getFirstName());
+        templateData.put("orderId", order.getId());
+        templateData.put("orderNumber", getDisplayOrderNumber(order));
+        templateData.put("orderDetailsUrl", buildOrderDetailsUrl(order));
+        templateData.put("orderDate", order.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")));
+        templateData.put("totalCost", String.format("%.2f", order.getTotalChf()));
+
+        emailNotificationService.sendEmail(
+                order.getCustomer().getEmail(),
+                "Conferma Ordine #" + getDisplayOrderNumber(order) + " - 3D-Fab",
+                "order-confirmation",
+                templateData
+        );
+    }
+
+    private void sendPaymentReportedEmail(Order order) {
+        Map<String, Object> templateData = new HashMap<>();
+        templateData.put("customerName", order.getCustomer().getFirstName());
+        templateData.put("orderId", order.getId());
+        templateData.put("orderNumber", getDisplayOrderNumber(order));
+        templateData.put("orderDetailsUrl", buildOrderDetailsUrl(order));
+
+        emailNotificationService.sendEmail(
+                order.getCustomer().getEmail(),
+                "Stiamo verificando il tuo pagamento (Ordine #" + getDisplayOrderNumber(order) + ")",
+                "payment-reported",
+                templateData
+        );
+    }
+
+    private void sendAdminNotificationEmail(Order order) {
+        Map<String, Object> templateData = new HashMap<>();
+        templateData.put("customerName", order.getCustomer().getFirstName() + " " + order.getCustomer().getLastName());
+        templateData.put("orderId", order.getId());
+        templateData.put("orderNumber", getDisplayOrderNumber(order));
+        templateData.put("orderDetailsUrl", buildOrderDetailsUrl(order));
+        templateData.put("orderDate", order.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")));
+        templateData.put("totalCost", String.format("%.2f", order.getTotalChf()));
+        
+        // Possiamo riutilizzare lo stesso template per ora o crearne uno ad-hoc in futuro
+        emailNotificationService.sendEmail(
+                adminMailAddress,
+                "Nuovo Ordine Ricevuto #" + getDisplayOrderNumber(order) + " - " + order.getCustomer().getLastName(),
+                "order-confirmation", 
+                templateData
+        );
+    }
+
+    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 String buildOrderDetailsUrl(Order order) {
+        String baseUrl = frontendBaseUrl == null ? "" : frontendBaseUrl.replaceAll("/+$", "");
+        return baseUrl + "/ordine/" + order.getId();
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.printcalculator.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+
+import java.time.LocalDateTime;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(VirusDetectedException.class)
+    public ResponseEntity<Object> handleVirusDetectedException(
+            VirusDetectedException ex, WebRequest request) {
+
+        Map<String, Object> body = new LinkedHashMap<>();
+        body.put("timestamp", LocalDateTime.now());
+        body.put("message", ex.getMessage());
+        body.put("error", "Virus Detected");
+
+        return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST);
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.printcalculator.exception;
+
+public class StorageException extends RuntimeException {
+
+    public StorageException(String message) {
+        super(message);
+    }
+
+    public StorageException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -0,0 +1,7 @@
+package com.printcalculator.exception;
+
+public class VirusDetectedException extends RuntimeException {
+    public VirusDetectedException(String message) {
+        super(message);
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.CustomQuoteRequestAttachment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface CustomQuoteRequestAttachmentRepository extends JpaRepository<CustomQuoteRequestAttachment, UUID> {
+}

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

@@ -0,0 +1,9 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.CustomQuoteRequest;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface CustomQuoteRequestRepository extends JpaRepository<CustomQuoteRequest, UUID> {
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.Customer;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public interface CustomerRepository extends JpaRepository<Customer, UUID> {
+    Optional<Customer> findByEmail(String email);
+}

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

@@ -0,0 +1,7 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.FilamentVariantStockKg;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface FilamentVariantStockKgRepository extends JpaRepository<FilamentVariantStockKg, Long> {
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.OrderItem;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface OrderItemRepository extends JpaRepository<OrderItem, UUID> {
+    List<OrderItem> findByOrder_Id(UUID orderId);
+}

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

@@ -0,0 +1,9 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.UUID;
+
+public interface OrderRepository extends JpaRepository<Order, UUID> {
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.Payment;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public interface PaymentRepository extends JpaRepository<Payment, UUID> {
+    Optional<Payment> findByOrder_Id(UUID orderId);
+}

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

@@ -0,0 +1,7 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.PrinterFleetCurrent;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PrinterFleetCurrentRepository extends JpaRepository<PrinterFleetCurrent, Long> {
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.QuoteLineItem;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface QuoteLineItemRepository extends JpaRepository<QuoteLineItem, UUID> {
+    List<QuoteLineItem> findByQuoteSessionId(UUID quoteSessionId);
+}

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

@@ -0,0 +1,11 @@
+package com.printcalculator.repository;
+
+import com.printcalculator.entity.QuoteSession;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface QuoteSessionRepository extends JpaRepository<QuoteSession, UUID> {
+    List<QuoteSession> findByCreatedAtBefore(java.time.OffsetDateTime cutoff);
+}

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

@@ -0,0 +1,64 @@
+package com.printcalculator.service;
+
+import com.printcalculator.exception.VirusDetectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import xyz.capybara.clamav.ClamavClient;
+import xyz.capybara.clamav.commands.scan.result.ScanResult;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Map;
+
+@Service
+public class ClamAVService {
+
+    private static final Logger logger = LoggerFactory.getLogger(ClamAVService.class);
+
+    private final ClamavClient clamavClient;
+    private final boolean enabled;
+
+    public ClamAVService(
+            @Value("${clamav.host:clamav}") String host,
+            @Value("${clamav.port:3310}") int port,
+            @Value("${clamav.enabled:true}") boolean enabled
+    ) {
+        this.enabled = enabled;
+        ClamavClient client = null;
+        try {
+            if (enabled) {
+                logger.info("Initializing ClamAV client at {}:{}", host, port);
+                client = new ClamavClient(host, port);
+            }
+        } catch (Exception e) {
+            logger.error("Failed to initialize ClamAV client: " + e.getMessage());
+        }
+        this.clamavClient = client;
+    }
+
+    public boolean scan(InputStream inputStream) {
+        if (!enabled || clamavClient == null) {
+            return true;
+        }
+        try {
+            ScanResult result = clamavClient.scan(inputStream);
+            if (result instanceof ScanResult.OK) {
+                return true;
+            } else if (result instanceof ScanResult.VirusFound) {
+                Map<String, Collection<String>> viruses = ((ScanResult.VirusFound) result).getFoundViruses();
+                logger.warn("VIRUS DETECTED: {}", viruses);
+                throw new VirusDetectedException("Virus detected in the uploaded file: " + viruses);
+            } else {
+                logger.warn("Unknown scan result: {}. Allowing file (FAIL-OPEN)", result);
+                return true;
+            }
+        } catch (VirusDetectedException e) {
+            throw e;
+        } catch (Exception e) {
+            logger.error("Error scanning file with ClamAV. Allowing file (FAIL-OPEN)", e);
+            return true;
+        }
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.printcalculator.service;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+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;
+import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+@Service
+public class FileSystemStorageService implements StorageService {
+
+    private final Path rootLocation;
+    private final ClamAVService clamAVService;
+
+    public FileSystemStorageService(@Value("${storage.location:storage_orders}") String storageLocation, ClamAVService clamAVService) {
+        this.rootLocation = Paths.get(storageLocation);
+        this.clamAVService = clamAVService;
+    }
+
+    @Override
+    public void init() {
+        try {
+            Files.createDirectories(rootLocation);
+        } catch (IOException e) {
+            throw new StorageException("Could not initialize storage", e);
+        }
+    }
+
+    @Override
+    public void store(MultipartFile file, Path destinationRelativePath) throws IOException {
+        Path destinationFile = this.rootLocation.resolve(destinationRelativePath).normalize().toAbsolutePath();
+        if (!destinationFile.getParent().startsWith(this.rootLocation.toAbsolutePath())) {
+            throw new StorageException("Cannot store file outside current directory.");
+        }
+
+        // 1. Salva prima il file su disco per evitare problemi di stream con file grandi
+        Files.createDirectories(destinationFile.getParent());
+        file.transferTo(destinationFile.toFile());
+
+        // 2. Scansiona il file appena salvato aprendo un nuovo stream
+        try (InputStream inputStream = new FileInputStream(destinationFile.toFile())) {
+            if (!clamAVService.scan(inputStream)) {
+                // Se infetto, cancella il file e solleva eccezione
+                Files.deleteIfExists(destinationFile);
+                throw new StorageException("File rejected by antivirus scanner.");
+            }
+        } catch (Exception e) {
+            if (e instanceof StorageException) throw e;
+            // Se l'antivirus fallisce per motivi tecnici, lasciamo il file (fail-open come concordato)
+        }
+    }
+
+    @Override
+    public void store(Path source, Path destinationRelativePath) throws IOException {
+        Path destinationFile = this.rootLocation.resolve(destinationRelativePath).normalize().toAbsolutePath();
+        if (!destinationFile.getParent().startsWith(this.rootLocation.toAbsolutePath())) {
+             throw new StorageException("Cannot store file outside current directory.");
+        }
+        Files.createDirectories(destinationFile.getParent());
+        Files.copy(source, destinationFile, StandardCopyOption.REPLACE_EXISTING);
+    }
+
+    @Override
+    public void delete(Path path) throws IOException {
+        Path file = rootLocation.resolve(path);
+        Files.deleteIfExists(file);
+    }
+
+    @Override
+    public Resource loadAsResource(Path path) throws IOException {
+        try {
+            Path file = rootLocation.resolve(path);
+            Resource resource = new UrlResource(file.toUri());
+            if (resource.exists() || resource.isReadable()) {
+                return resource;
+            } else {
+                throw new RuntimeException("Could not read file: " + path);
+            }
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("Could not read file: " + path, e);
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.printcalculator.service;
+
+import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
+import com.openhtmltopdf.svgsupport.BatikSVGDrawer;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Map;
+
+@Service
+public class InvoicePdfRenderingService {
+
+    private final TemplateEngine thymeleafTemplateEngine;
+
+    public InvoicePdfRenderingService(TemplateEngine thymeleafTemplateEngine) {
+        this.thymeleafTemplateEngine = thymeleafTemplateEngine;
+    }
+
+    public byte[] generateInvoicePdfBytesFromTemplate(Map<String, Object> invoiceTemplateVariables, String qrBillSvg) {
+        try {
+            Context thymeleafContextWithInvoiceData = new Context(Locale.ITALY);
+            thymeleafContextWithInvoiceData.setVariables(invoiceTemplateVariables);
+            thymeleafContextWithInvoiceData.setVariable("qrBillSvg", qrBillSvg);
+
+            String renderedInvoiceHtml = thymeleafTemplateEngine.process("invoice", thymeleafContextWithInvoiceData);
+
+            String classpathBaseUrlForHtmlResources = new ClassPathResource("templates/").getURL().toExternalForm();
+
+            ByteArrayOutputStream generatedPdfByteArrayOutputStream = new ByteArrayOutputStream();
+
+            PdfRendererBuilder openHtmlToPdfRendererBuilder = new PdfRendererBuilder();
+            openHtmlToPdfRendererBuilder.useFastMode();
+            openHtmlToPdfRendererBuilder.useSVGDrawer(new BatikSVGDrawer());
+            openHtmlToPdfRendererBuilder.withHtmlContent(renderedInvoiceHtml, classpathBaseUrlForHtmlResources);
+            openHtmlToPdfRendererBuilder.toStream(generatedPdfByteArrayOutputStream);
+            openHtmlToPdfRendererBuilder.run();
+
+            return generatedPdfByteArrayOutputStream.toByteArray();
+        } catch (Exception pdfGenerationException) {
+            throw new IllegalStateException("PDF invoice generation failed", pdfGenerationException);
+        }
+    }
+}

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

@@ -0,0 +1,322 @@
+package com.printcalculator.service;
+
+import com.printcalculator.dto.AddressDto;
+import com.printcalculator.dto.CreateOrderRequest;
+import com.printcalculator.entity.*;
+import com.printcalculator.repository.CustomerRepository;
+import com.printcalculator.repository.OrderItemRepository;
+import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.QuoteLineItemRepository;
+import com.printcalculator.repository.QuoteSessionRepository;
+import com.printcalculator.event.OrderCreatedEvent;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class 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 ApplicationEventPublisher eventPublisher;
+    private final PaymentService paymentService;
+
+    public OrderService(OrderRepository orderRepo,
+                        OrderItemRepository orderItemRepo,
+                        QuoteSessionRepository quoteSessionRepo,
+                        QuoteLineItemRepository quoteLineItemRepo,
+                        CustomerRepository customerRepo,
+                        StorageService storageService,
+                        InvoicePdfRenderingService invoiceService,
+                        QrBillService qrBillService,
+                        ApplicationEventPublisher eventPublisher,
+                        PaymentService paymentService) {
+        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.eventPublisher = eventPublisher;
+        this.paymentService = paymentService;
+    }
+
+    @Transactional
+    public Order createOrderFromQuote(UUID quoteSessionId, CreateOrderRequest request) {
+        QuoteSession session = quoteSessionRepo.findById(quoteSessionId)
+                .orElseThrow(() -> new RuntimeException("Quote Session not found"));
+
+        if (session.getConvertedOrderId() != null) {
+            throw new IllegalStateException("Quote session already converted to order");
+        }
+
+        Customer customer = customerRepo.findByEmail(request.getCustomer().getEmail())
+                .orElseGet(() -> {
+                    Customer newC = new Customer();
+                    newC.setEmail(request.getCustomer().getEmail());
+                    newC.setCustomerType(request.getCustomer().getCustomerType());
+                    newC.setCreatedAt(OffsetDateTime.now());
+                    newC.setUpdatedAt(OffsetDateTime.now());
+                    return customerRepo.save(newC);
+                });
+
+        customer.setPhone(request.getCustomer().getPhone());
+        customer.setCustomerType(request.getCustomer().getCustomerType());
+        customer.setUpdatedAt(OffsetDateTime.now());
+        customerRepo.save(customer);
+
+        Order order = new Order();
+        order.setSourceQuoteSession(session);
+        order.setCustomer(customer);
+        order.setCustomerEmail(request.getCustomer().getEmail());
+        order.setCustomerPhone(request.getCustomer().getPhone());
+        order.setStatus("PENDING_PAYMENT");
+        order.setCreatedAt(OffsetDateTime.now());
+        order.setUpdatedAt(OffsetDateTime.now());
+        order.setCurrency("CHF");
+
+        order.setBillingCustomerType(request.getCustomer().getCustomerType());
+        if (request.getBillingAddress() != null) {
+            order.setBillingFirstName(request.getBillingAddress().getFirstName());
+            order.setBillingLastName(request.getBillingAddress().getLastName());
+            order.setBillingCompanyName(request.getBillingAddress().getCompanyName());
+            order.setBillingContactPerson(request.getBillingAddress().getContactPerson());
+            order.setBillingAddressLine1(request.getBillingAddress().getAddressLine1());
+            order.setBillingAddressLine2(request.getBillingAddress().getAddressLine2());
+            order.setBillingZip(request.getBillingAddress().getZip());
+            order.setBillingCity(request.getBillingAddress().getCity());
+            order.setBillingCountryCode(request.getBillingAddress().getCountryCode() != null ? request.getBillingAddress().getCountryCode() : "CH");
+        }
+
+        order.setShippingSameAsBilling(request.isShippingSameAsBilling());
+        if (!request.isShippingSameAsBilling() && request.getShippingAddress() != null) {
+            order.setShippingFirstName(request.getShippingAddress().getFirstName());
+            order.setShippingLastName(request.getShippingAddress().getLastName());
+            order.setShippingCompanyName(request.getShippingAddress().getCompanyName());
+            order.setShippingContactPerson(request.getShippingAddress().getContactPerson());
+            order.setShippingAddressLine1(request.getShippingAddress().getAddressLine1());
+            order.setShippingAddressLine2(request.getShippingAddress().getAddressLine2());
+            order.setShippingZip(request.getShippingAddress().getZip());
+            order.setShippingCity(request.getShippingAddress().getCity());
+            order.setShippingCountryCode(request.getShippingAddress().getCountryCode() != null ? request.getShippingAddress().getCountryCode() : "CH");
+        } else {
+            order.setShippingFirstName(order.getBillingFirstName());
+            order.setShippingLastName(order.getBillingLastName());
+            order.setShippingCompanyName(order.getBillingCompanyName());
+            order.setShippingContactPerson(order.getBillingContactPerson());
+            order.setShippingAddressLine1(order.getBillingAddressLine1());
+            order.setShippingAddressLine2(order.getBillingAddressLine2());
+            order.setShippingZip(order.getBillingZip());
+            order.setShippingCity(order.getBillingCity());
+            order.setShippingCountryCode(order.getBillingCountryCode());
+        }
+
+        List<QuoteLineItem> quoteItems = quoteLineItemRepo.findByQuoteSessionId(quoteSessionId);
+
+        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);
+        order.setShippingCostChf(BigDecimal.valueOf(9.00));
+
+        order = orderRepo.save(order);
+
+        List<OrderItem> savedItems = new ArrayList<>();
+
+        for (QuoteLineItem qItem : quoteItems) {
+            OrderItem oItem = new OrderItem();
+            oItem.setOrder(order);
+            oItem.setOriginalFilename(qItem.getOriginalFilename());
+            oItem.setQuantity(qItem.getQuantity());
+            oItem.setColorCode(qItem.getColorCode());
+            oItem.setMaterialCode(session.getMaterialCode());
+
+            oItem.setUnitPriceChf(qItem.getUnitPriceChf());
+            oItem.setLineTotalChf(qItem.getUnitPriceChf().multiply(BigDecimal.valueOf(qItem.getQuantity())));
+            oItem.setPrintTimeSeconds(qItem.getPrintTimeSeconds());
+            oItem.setMaterialGrams(qItem.getMaterialGrams());
+
+            UUID fileUuid = UUID.randomUUID();
+            String ext = getExtension(qItem.getOriginalFilename());
+            String storedFilename = fileUuid.toString() + "." + ext;
+
+            oItem.setStoredFilename(storedFilename);
+            oItem.setStoredRelativePath("PENDING");
+            oItem.setMimeType("application/octet-stream");
+            oItem.setCreatedAt(OffsetDateTime.now());
+
+            oItem = orderItemRepo.save(oItem);
+
+            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();
+                }
+            }
+
+            oItem = orderItemRepo.save(oItem);
+            savedItems.add(oItem);
+            subtotal = subtotal.add(oItem.getLineTotalChf());
+        }
+
+        order.setSubtotalChf(subtotal);
+        if (order.getShippingCostChf() == null) {
+            order.setShippingCostChf(BigDecimal.valueOf(9.00));
+        }
+
+        BigDecimal total = subtotal.add(order.getSetupCostChf()).add(order.getShippingCostChf()).subtract(order.getDiscountChf() != null ? order.getDiscountChf() : BigDecimal.ZERO);
+        order.setTotalChf(total);
+
+        session.setConvertedOrderId(order.getId());
+        session.setStatus("CONVERTED");
+        quoteSessionRepo.save(session);
+
+        // Generate Invoice and QR Bill
+        generateAndSaveDocuments(order, savedItems);
+
+        Order savedOrder = orderRepo.save(order);
+
+        // ALWAYS initialize payment as PENDING
+        paymentService.getOrCreatePaymentForOrder(savedOrder, "OTHER");
+
+        eventPublisher.publishEvent(new OrderCreatedEvent(this, savedOrder));
+
+        return savedOrder;
+    }
+    
+    private void generateAndSaveDocuments(Order order, List<OrderItem> items) {
+        try {
+            // 1. Generate QR Bill
+            byte[] qrBillSvgBytes = qrBillService.generateQrBillSvg(order);
+            String qrBillSvg = new String(qrBillSvgBytes, StandardCharsets.UTF_8);
+
+            // Strip XML declaration and DOCTYPE if present, as they validity break the embedding HTML page
+            if (qrBillSvg.contains("<?xml")) {
+                int svgStartIndex = qrBillSvg.indexOf("<svg");
+                if (svgStartIndex != -1) {
+                    qrBillSvg = qrBillSvg.substring(svgStartIndex);
+                }
+            }
+            
+            // Save QR Bill SVG
+            String qrRelativePath = "orders/" + order.getId() + "/documents/qr-bill.svg";
+            saveFileBytes(qrBillSvgBytes, qrRelativePath);
+
+            // 2. Prepare Invoice Variables
+            Map<String, Object> vars = new HashMap<>();
+            vars.put("sellerDisplayName", "3D Fab Switzerland");
+            vars.put("sellerAddressLine1", "Sede Ticino, Svizzera");
+            vars.put("sellerAddressLine2", "Sede Bienne, Svizzera");
+            vars.put("sellerEmail", "info@3dfab.ch");
+
+            vars.put("invoiceNumber", "INV-" + getDisplayOrderNumber(order).toUpperCase());
+            vars.put("invoiceDate", order.getCreatedAt().format(DateTimeFormatter.ISO_LOCAL_DATE));
+            vars.put("dueDate", order.getCreatedAt().plusDays(7).format(DateTimeFormatter.ISO_LOCAL_DATE));
+
+            String buyerName = "BUSINESS".equals(order.getBillingCustomerType())
+                    ? order.getBillingCompanyName()
+                    : order.getBillingFirstName() + " " + order.getBillingLastName();
+            vars.put("buyerDisplayName", buyerName);
+            vars.put("buyerAddressLine1", order.getBillingAddressLine1());
+            vars.put("buyerAddressLine2", order.getBillingZip() + " " + order.getBillingCity() + ", " + order.getBillingCountryCode());
+
+            List<Map<String, Object>> invoiceLineItems = items.stream().map(i -> {
+                Map<String, Object> line = new HashMap<>();
+                line.put("description", "Stampa 3D: " + i.getOriginalFilename());
+                line.put("quantity", i.getQuantity());
+                line.put("unitPriceFormatted", String.format("CHF %.2f", i.getUnitPriceChf()));
+                line.put("lineTotalFormatted", String.format("CHF %.2f", i.getLineTotalChf()));
+                return line;
+            }).collect(Collectors.toList());
+
+            Map<String, Object> setupLine = new HashMap<>();
+            setupLine.put("description", "Costo Setup");
+            setupLine.put("quantity", 1);
+            setupLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
+            setupLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getSetupCostChf()));
+            invoiceLineItems.add(setupLine);
+
+            Map<String, Object> shippingLine = new HashMap<>();
+            shippingLine.put("description", "Spedizione");
+            shippingLine.put("quantity", 1);
+            shippingLine.put("unitPriceFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
+            shippingLine.put("lineTotalFormatted", String.format("CHF %.2f", order.getShippingCostChf()));
+            invoiceLineItems.add(shippingLine);
+
+            vars.put("invoiceLineItems", invoiceLineItems);
+            vars.put("subtotalFormatted", String.format("CHF %.2f", order.getSubtotalChf()));
+            vars.put("grandTotalFormatted", String.format("CHF %.2f", order.getTotalChf()));
+            vars.put("paymentTermsText", "Appena riceviamo il pagamento l'ordine entrerà nella coda di stampa. Grazie per la fiducia");
+
+            // 3. Generate PDF
+            byte[] pdfBytes = invoiceService.generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
+            
+            // Save PDF
+            String pdfRelativePath = "orders/" + order.getId() + "/documents/invoice-" + order.getId() + ".pdf";
+            saveFileBytes(pdfBytes, pdfRelativePath);
+
+        } catch (Exception e) {
+            e.printStackTrace(); 
+            // Don't fail the order if document generation fails, but log it
+            // TODO: Better error handling
+        }
+    }
+
+    private void saveFileBytes(byte[] content, String relativePath) {
+        // Since StorageService takes paths, we might need to write to temp first or check if it supports bytes/streams
+        // Simulating via temp file for now as StorageService.store takes a Path
+        try {
+            Path tempFile = Files.createTempFile("print-calc-upload", ".tmp");
+            Files.write(tempFile, content);
+            storageService.store(tempFile, Paths.get(relativePath));
+            Files.delete(tempFile);
+        } catch (IOException e) {
+             throw new RuntimeException("Failed to save file " + relativePath, e);
+        }
+    }
+
+    private String getExtension(String filename) {
+        if (filename == null) return "stl";
+        int i = filename.lastIndexOf('.');
+        if (i > 0) {
+            return filename.substring(i + 1);
+        }
+        return "stl";
+    }
+
+    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/PaymentService.java

@@ -0,0 +1,74 @@
+package com.printcalculator.service;
+
+import com.printcalculator.entity.Order;
+import com.printcalculator.entity.Payment;
+import com.printcalculator.event.PaymentReportedEvent;
+import com.printcalculator.repository.OrderRepository;
+import com.printcalculator.repository.PaymentRepository;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+public class PaymentService {
+
+    private final PaymentRepository paymentRepo;
+    private final OrderRepository orderRepo;
+    private final ApplicationEventPublisher eventPublisher;
+
+    public PaymentService(PaymentRepository paymentRepo,
+                          OrderRepository orderRepo,
+                          ApplicationEventPublisher eventPublisher) {
+        this.paymentRepo = paymentRepo;
+        this.orderRepo = orderRepo;
+        this.eventPublisher = eventPublisher;
+    }
+
+    @Transactional
+    public Payment getOrCreatePaymentForOrder(Order order, String defaultMethod) {
+        Optional<Payment> existing = paymentRepo.findByOrder_Id(order.getId());
+        if (existing.isPresent()) {
+            return existing.get();
+        }
+
+        Payment payment = new Payment();
+        payment.setOrder(order);
+        payment.setMethod(defaultMethod != null ? defaultMethod : "OTHER");
+        payment.setStatus("PENDING");
+        payment.setCurrency(order.getCurrency() != null ? order.getCurrency() : "CHF");
+        payment.setAmountChf(order.getTotalChf() != null ? order.getTotalChf() : BigDecimal.ZERO);
+        payment.setInitiatedAt(OffsetDateTime.now());
+
+        return paymentRepo.save(payment);
+    }
+
+    @Transactional
+    public Payment reportPayment(UUID orderId, String method) {
+        Order order = orderRepo.findById(orderId)
+                .orElseThrow(() -> new RuntimeException("Order not found with id " + orderId));
+
+        Payment payment = paymentRepo.findByOrder_Id(orderId)
+                .orElseThrow(() -> new RuntimeException("No active payment found for order " + orderId));
+
+        if (!"PENDING".equals(payment.getStatus())) {
+            throw new IllegalStateException("Payment is not in PENDING state. Current state: " + payment.getStatus());
+        }
+
+        payment.setStatus("REPORTED");
+        payment.setReportedAt(OffsetDateTime.now());
+        if (method != null && !method.isBlank()) {
+            payment.setMethod(method);
+        }
+
+        payment = paymentRepo.save(payment);
+
+        eventPublisher.publishEvent(new PaymentReportedEvent(this, order, payment));
+
+        return payment;
+    }
+}

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

@@ -10,18 +10,23 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Optional;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 @Service
 public class ProfileManager {
 
     private static final Logger logger = Logger.getLogger(ProfileManager.class.getName());
     private final String profilesRoot;
+    private final Path resolvedProfilesRoot;
     private final ObjectMapper mapper;
 
     private final Map<String, String> profileAliases;
@@ -31,6 +36,8 @@ public class ProfileManager {
         this.mapper = mapper;
         this.profileAliases = new HashMap<>();
         initializeAliases();
+        this.resolvedProfilesRoot = resolveProfilesRoot(profilesRoot);
+        logger.info("Profiles root configured as '" + this.profilesRoot + "', resolved to '" + this.resolvedProfilesRoot + "'");
     }
 
     private void initializeAliases() {
@@ -54,30 +61,82 @@ public class ProfileManager {
     public ObjectNode getMergedProfile(String profileName, String type) throws IOException {
         Path profilePath = findProfileFile(profileName, type);
         if (profilePath == null) {
-            throw new IOException("Profile not found: " + profileName);
+            throw new IOException("Profile not found: " + profileName + " (root=" + resolvedProfilesRoot + ")");
         }
+        logger.info("Resolved " + type + " profile '" + profileName + "' -> " + profilePath);
         return resolveInheritance(profilePath);
     }
 
     private Path findProfileFile(String name, String type) {
+        if (!Files.isDirectory(resolvedProfilesRoot)) {
+            logger.severe("Profiles root does not exist or is not a directory: " + resolvedProfilesRoot);
+            return null;
+        }
+
         // Check aliases first
         String resolvedName = profileAliases.getOrDefault(name, name);
-        
-        // Simple search: look for name.json in the profiles_root recursively
-        // Type could be "machine", "process", "filament" to narrow down, but for now global search
-        String filename = resolvedName.endsWith(".json") ? resolvedName : resolvedName + ".json";
-        
-        try (Stream<Path> stream = Files.walk(Paths.get(profilesRoot))) {
-            Optional<Path> found = stream
+
+        // Look for name.json under the expected type directory first to avoid
+        // collisions across vendors/profile families with same filename.
+        String filename = toJsonFilename(resolvedName);
+
+        try (Stream<Path> stream = Files.walk(resolvedProfilesRoot)) {
+            List<Path> candidates = stream
                     .filter(p -> p.getFileName().toString().equals(filename))
-                    .findFirst();
-            return found.orElse(null);
+                    .sorted()
+                    .toList();
+
+            if (candidates.isEmpty()) {
+                return null;
+            }
+
+            if (type != null && !type.isBlank() && !"any".equalsIgnoreCase(type)) {
+                Optional<Path> typed = candidates.stream()
+                        .filter(p -> pathContainsSegment(p, type))
+                        .findFirst();
+                if (typed.isPresent()) {
+                    return typed.get();
+                }
+            }
+
+            return candidates.get(0);
         } catch (IOException e) {
             logger.severe("Error searching for profile: " + e.getMessage());
             return null;
         }
     }
 
+    private Path resolveProfilesRoot(String configuredRoot) {
+        Set<Path> candidates = new LinkedHashSet<>();
+        Path cwd = Paths.get("").toAbsolutePath().normalize();
+
+        if (configuredRoot != null && !configuredRoot.isBlank()) {
+            Path configured = Paths.get(configuredRoot);
+            candidates.add(configured.toAbsolutePath().normalize());
+            if (!configured.isAbsolute()) {
+                candidates.add(cwd.resolve(configuredRoot).normalize());
+            }
+        }
+
+        candidates.add(cwd.resolve("profiles").normalize());
+        candidates.add(cwd.resolve("backend/profiles").normalize());
+        candidates.add(Paths.get("/app/profiles").toAbsolutePath().normalize());
+
+        List<String> checkedPaths = new ArrayList<>();
+        for (Path candidate : candidates) {
+            checkedPaths.add(candidate.toString());
+            if (Files.isDirectory(candidate)) {
+                return candidate;
+            }
+        }
+
+        logger.warning("No profiles directory found. Checked: " + String.join(", ", checkedPaths));
+        if (configuredRoot != null && !configuredRoot.isBlank()) {
+            return Paths.get(configuredRoot).toAbsolutePath().normalize();
+        }
+        return cwd.resolve("profiles").normalize();
+    }
+
     private ObjectNode resolveInheritance(Path currentPath) throws IOException {
         // 1. Load current
         JsonNode currentNode = mapper.readTree(currentPath.toFile());
@@ -85,14 +144,20 @@ public class ProfileManager {
         // 2. Check inherits
         if (currentNode.has("inherits")) {
             String parentName = currentNode.get("inherits").asText();
-            // Try to find parent in same directory or standard search
-            Path parentPath = currentPath.getParent().resolve(parentName);
+            // Try local directory first with explicit .json filename.
+            String parentFilename = toJsonFilename(parentName);
+            Path parentPath = currentPath.getParent().resolve(parentFilename);
             if (!Files.exists(parentPath)) {
-                // If not in same dir, search globally
+                // Fallback to the same profile type directory before global.
+                String inferredType = inferTypeFromPath(currentPath);
+                parentPath = findProfileFile(parentName, inferredType);
+            }
+            if (parentPath == null || !Files.exists(parentPath)) {
                 parentPath = findProfileFile(parentName, "any");
             }
 
             if (parentPath != null && Files.exists(parentPath)) {
+                logger.info("Resolved inherits '" + parentName + "' for " + currentPath + " -> " + parentPath);
                 // Recursive call
                 ObjectNode parentNode = resolveInheritance(parentPath);
                 // Merge current into parent (child overrides parent)
@@ -123,4 +188,30 @@ public class ProfileManager {
             mainNode.set(fieldName, jsonNode);
         }
     }
+
+    private String toJsonFilename(String name) {
+        return name.endsWith(".json") ? name : name + ".json";
+    }
+
+    private boolean pathContainsSegment(Path path, String segment) {
+        String normalized = path.toString().replace('\\', '/');
+        String needle = "/" + segment + "/";
+        return normalized.contains(needle);
+    }
+
+    private String inferTypeFromPath(Path path) {
+        if (path == null) {
+            return "any";
+        }
+        if (pathContainsSegment(path, "machine")) {
+            return "machine";
+        }
+        if (pathContainsSegment(path, "process")) {
+            return "process";
+        }
+        if (pathContainsSegment(path, "filament")) {
+            return "filament";
+        }
+        return "any";
+    }
 }

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

@@ -0,0 +1,69 @@
+package com.printcalculator.service;
+
+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 {
+
+    public byte[] generateQrBillSvg(Order order) {
+        Bill bill = createBillFromOrder(order);
+        return QRBill.generate(bill);
+    }
+    
+    public Bill createBillFromOrder(Order order) {
+        Bill bill = new Bill();
+
+        // Creditor (Merchant)
+        bill.setAccount("CH7409000000154821581"); // TODO: Configurable IBAN
+        bill.setCreditor(createAddress(
+                "Küng, Joe",
+                "Via G. Pioda 29a",
+                "6710",
+                "Biasca",
+                "CH"
+        ));
+
+        // Debtor (Customer)
+        String debtorName;
+        if ("BUSINESS".equals(order.getBillingCustomerType())) {
+            debtorName = order.getBillingCompanyName();
+        } else {
+            debtorName = order.getBillingFirstName() + " " + order.getBillingLastName();
+        }
+        
+        bill.setDebtor(createAddress(
+                debtorName,
+                order.getBillingAddressLine1(), // Assuming simple address for now. Splitting might be needed if street/house number are separate
+                order.getBillingZip(),
+                order.getBillingCity(),
+                order.getBillingCountryCode()
+        ));
+
+        // Amount
+        bill.setAmount(order.getTotalChf());
+        bill.setCurrency("CHF");
+
+        // Reference
+        // bill.setReference(QRBill.createCreditorReference("...")); // If using QRR
+        String orderRef = order.getOrderNumber() != null ? order.getOrderNumber() : order.getId().toString();
+        bill.setUnstructuredMessage("Order " + orderRef);
+
+        return bill;
+    }
+
+    private net.codecrete.qrbill.generator.Address createAddress(String name, String street, String zip, String city, String country) {
+        net.codecrete.qrbill.generator.Address address = new net.codecrete.qrbill.generator.Address();
+        address.setName(name);
+        address.setStreet(street);
+        address.setPostalCode(zip);
+        address.setTown(city);
+        address.setCountryCode(country);
+        return address;
+    }
+}

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

@@ -0,0 +1,79 @@
+package com.printcalculator.service;
+
+import com.printcalculator.entity.QuoteSession;
+import com.printcalculator.repository.QuoteSessionRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.stream.Stream;
+
+@Service
+public class SessionCleanupService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SessionCleanupService.class);
+    private final QuoteSessionRepository sessionRepository;
+
+    public SessionCleanupService(QuoteSessionRepository sessionRepository) {
+        this.sessionRepository = sessionRepository;
+    }
+
+    // Run every day at 3 AM
+    @Scheduled(cron = "0 0 3 * * ?")
+    @Transactional
+    public void cleanupOldSessions() {
+        logger.info("Starting session cleanup job...");
+
+        OffsetDateTime cutoff = OffsetDateTime.now().minusDays(15);
+        List<QuoteSession> oldSessions = sessionRepository.findByCreatedAtBefore(cutoff);
+
+        int deletedCount = 0;
+        for (QuoteSession session : oldSessions) {
+            // We only delete sessions that are NOT ordered? 
+            // The user request was "delete old ones". 
+            // Safest is to check status if we had one. 
+            // QuoteSession entity has 'status' field.
+            // Let's assume we delete 'PENDING' or similar, but maybe we just delete all old inputs?
+            // "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())) {
+                continue;
+            }
+
+            try {
+                // Delete ACTIVE or EXPIRED sessions older than 7 days
+                deleteSessionFiles(session.getId().toString());
+                sessionRepository.delete(session);
+                deletedCount++;
+            } catch (Exception e) {
+                logger.error("Failed to cleanup session {}", session.getId(), e);
+            }
+        }
+
+        logger.info("Session cleanup job finished. Deleted {} sessions.", deletedCount);
+    }
+
+    private void deleteSessionFiles(String sessionId) {
+        Path sessionDir = Paths.get("storage_quotes", sessionId);
+        if (Files.exists(sessionDir)) {
+            try (Stream<Path> walk = Files.walk(sessionDir)) {
+                walk.sorted(java.util.Comparator.reverseOrder())
+                    .map(Path::toFile)
+                    .forEach(java.io.File::delete);
+            } catch (IOException e) {
+                logger.error("Failed to delete directory: {}", sessionDir, e);
+            }
+        }
+    }
+}

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

@@ -10,7 +10,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -44,6 +46,12 @@ public class SlicerService {
         ObjectNode filamentProfile = profileManager.getMergedProfile(filamentName, "filament");
         ObjectNode processProfile = profileManager.getMergedProfile(processName, "process");
 
+        logger.info("Slicer profiles: machine='" + machineName + "', filament='" + filamentName + "', process='" + processName + "'");
+        logger.info("Machine limits: printable_area=" + machineProfile.path("printable_area")
+                + ", printable_height=" + machineProfile.path("printable_height")
+                + ", bed_exclude_area=" + machineProfile.path("bed_exclude_area")
+                + ", head_wrap_detect_zone=" + machineProfile.path("head_wrap_detect_zone"));
+
         // Apply Overrides
         if (machineOverrides != null) {
             machineOverrides.forEach(machineProfile::put);
@@ -63,84 +71,110 @@ public class SlicerService {
             mapper.writeValue(fFile, filamentProfile);
             mapper.writeValue(pFile, processProfile);
 
-            // 3. Build Command
-            // --load-settings "machine.json;process.json" --load-filaments "filament.json"
-            List<String> command = new ArrayList<>();
-            command.add(slicerPath);
-            
-            // Load machine settings
-            command.add("--load-settings");
-            command.add(mFile.getAbsolutePath());
-            
-            // Load process settings
-            command.add("--load-settings");
-            command.add(pFile.getAbsolutePath());
-            command.add("--load-filaments");
-            command.add(fFile.getAbsolutePath());
-            command.add("--ensure-on-bed");
-            command.add("--arrange");
-            command.add("1"); // force arrange
-            command.add("--slice");
-            command.add("0"); // slice plate 0
-            command.add("--outputdir");
-            command.add(tempDir.toAbsolutePath().toString());
-            // Need to handle Mac structure for console if needed? 
-            // Usually the binary at Contents/MacOS/OrcaSlicer works fine as console app.
-            
-            command.add(inputStl.getAbsolutePath());
-
-            logger.info("Executing Slicer: " + String.join(" ", command));
-
-            // 4. Run Process
-            ProcessBuilder pb = new ProcessBuilder(command);
-            pb.directory(tempDir.toFile());
-            // pb.inheritIO(); // Useful for debugging, but maybe capture instead?
-            
-            Process process = pb.start();
-            boolean finished = process.waitFor(5, TimeUnit.MINUTES);
-            
-            if (!finished) {
-                process.destroy();
-                throw new IOException("Slicer timed out");
-            }
-            
-            if (process.exitValue() != 0) {
-                // Read stderr
-                String error = new String(process.getErrorStream().readAllBytes());
-                throw new IOException("Slicer failed with exit code " + process.exitValue() + ": " + error);
-            }
-
-            // 5. Find Output GCode
-            // Usually [basename].gcode or plate_1.gcode
             String basename = inputStl.getName();
             if (basename.toLowerCase().endsWith(".stl")) {
                 basename = basename.substring(0, basename.length() - 4);
             }
-            
-            File gcodeFile = tempDir.resolve(basename + ".gcode").toFile();
-            if (!gcodeFile.exists()) {
-                // Try plate_1.gcode fallback
-                File alt = tempDir.resolve("plate_1.gcode").toFile();
-                if (alt.exists()) {
-                    gcodeFile = alt;
-                } else {
-                     throw new IOException("GCode output not found in " + tempDir);
+            Path slicerLogPath = tempDir.resolve("orcaslicer.log");
+
+            // 3. Run slicer. Retry with arrange only for out-of-volume style failures.
+            for (boolean useArrange : new boolean[]{false, true}) {
+                List<String> command = new ArrayList<>();
+                command.add(slicerPath);
+                command.add("--load-settings");
+                command.add(mFile.getAbsolutePath());
+                command.add("--load-settings");
+                command.add(pFile.getAbsolutePath());
+                command.add("--load-filaments");
+                command.add(fFile.getAbsolutePath());
+                command.add("--ensure-on-bed");
+                if (useArrange) {
+                    command.add("--arrange");
+                    command.add("1");
                 }
+                command.add("--slice");
+                command.add("0");
+                command.add("--outputdir");
+                command.add(tempDir.toAbsolutePath().toString());
+                command.add(inputStl.getAbsolutePath());
+
+                logger.info("Executing Slicer" + (useArrange ? " (retry with arrange)" : "") + ": " + String.join(" ", command));
+
+                Files.deleteIfExists(slicerLogPath);
+                ProcessBuilder pb = new ProcessBuilder(command);
+                pb.directory(tempDir.toFile());
+                pb.redirectErrorStream(true);
+                pb.redirectOutput(slicerLogPath.toFile());
+
+                Process process = pb.start();
+                boolean finished = process.waitFor(5, TimeUnit.MINUTES);
+
+                if (!finished) {
+                    process.destroyForcibly();
+                    throw new IOException("Slicer timed out");
+                }
+
+                if (process.exitValue() != 0) {
+                    String error = "";
+                    if (Files.exists(slicerLogPath)) {
+                        error = Files.readString(slicerLogPath, StandardCharsets.UTF_8);
+                    }
+                    if (!useArrange && isOutOfVolumeError(error)) {
+                        logger.warning("Slicer reported model out of printable area, retrying with arrange.");
+                        continue;
+                    }
+                    throw new IOException("Slicer failed with exit code " + process.exitValue() + ": " + error);
+                }
+
+                File gcodeFile = tempDir.resolve(basename + ".gcode").toFile();
+                if (!gcodeFile.exists()) {
+                    File alt = tempDir.resolve("plate_1.gcode").toFile();
+                    if (alt.exists()) {
+                        gcodeFile = alt;
+                    } else {
+                        throw new IOException("GCode output not found in " + tempDir);
+                    }
+                }
+
+                return gCodeParser.parse(gcodeFile);
             }
 
-            // 6. Parse Results
-            return gCodeParser.parse(gcodeFile);
+            throw new IOException("Slicer failed after retry");
 
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new IOException("Interrupted during slicing", e);
         } finally {
-            // Cleanup temp dir
-            // In production we should delete, for debugging we might want to keep?
-            // Let's delete for now on success.
-            // recursiveDelete(tempDir);
-            // Leaving it effectively "leaks" temp, but safer for persistent debugging?
-            // Implementation detail: Use a utility to clean up.
+            deleteRecursively(tempDir);
         }
     }
+
+    private void deleteRecursively(Path path) {
+        if (path == null || !Files.exists(path)) {
+            return;
+        }
+
+        try (var walk = Files.walk(path)) {
+            walk.sorted(Comparator.reverseOrder()).forEach(p -> {
+                try {
+                    Files.deleteIfExists(p);
+                } catch (IOException e) {
+                    logger.warning("Failed to delete temp path " + p + ": " + e.getMessage());
+                }
+            });
+        } catch (IOException e) {
+            logger.warning("Failed to walk temp directory " + path + ": " + e.getMessage());
+        }
+    }
+
+    private boolean isOutOfVolumeError(String errorLog) {
+        if (errorLog == null || errorLog.isBlank()) {
+            return false;
+        }
+
+        String normalized = errorLog.toLowerCase();
+        return normalized.contains("nothing to be sliced")
+                || normalized.contains("no object is fully inside the print volume")
+                || normalized.contains("calc_exclude_triangles");
+    }
 }

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

@@ -0,0 +1,14 @@
+package com.printcalculator.service;
+
+import org.springframework.core.io.Resource;
+import org.springframework.web.multipart.MultipartFile;
+import java.nio.file.Path;
+import java.io.IOException;
+
+public interface StorageService {
+    void init();
+    void store(MultipartFile file, Path destination) throws IOException;
+    void store(Path source, Path destination) throws IOException;
+    void delete(Path path) throws IOException;
+    Resource loadAsResource(Path path) throws IOException;
+}

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

@@ -0,0 +1,66 @@
+package com.printcalculator.service;
+
+import io.nayuki.qrcodegen.QrCode;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+
+@Service
+public class TwintPaymentService {
+
+    private final String twintPaymentUrl;
+
+    public TwintPaymentService(
+            @Value("${payment.twint.url:https://go.twint.ch/1/e/tw?tw=acq.gERQQytOTnyIMuQHUqn4hlxgciHE5X7nnqHnNSPAr2OF2K3uBlXJDr2n9JU3sgxa.}")
+            String twintPaymentUrl
+    ) {
+        this.twintPaymentUrl = twintPaymentUrl;
+    }
+
+    public String getTwintPaymentUrl() {
+        return twintPaymentUrl;
+    }
+
+    public byte[] generateQrPng(int sizePx) {
+        try {
+            // Use High Error Correction for financial QR codes
+            QrCode qrCode = QrCode.encodeText(twintPaymentUrl, QrCode.Ecc.HIGH);
+            
+            // Standard QR quiet zone is 4 modules
+            int borderModules = 4;
+            int fullModules = qrCode.size + borderModules * 2;
+            int scale = Math.max(1, sizePx / fullModules);
+            int imageSize = fullModules * scale;
+
+            BufferedImage image = new BufferedImage(imageSize, imageSize, BufferedImage.TYPE_INT_RGB);
+            Graphics2D graphics = image.createGraphics();
+            try {
+                graphics.setColor(Color.WHITE);
+                graphics.fillRect(0, 0, imageSize, imageSize);
+                graphics.setColor(Color.BLACK);
+
+                for (int y = 0; y < qrCode.size; y++) {
+                    for (int x = 0; x < qrCode.size; x++) {
+                        if (qrCode.getModule(x, y)) {
+                            int px = (x + borderModules) * scale;
+                            int py = (y + borderModules) * scale;
+                            graphics.fillRect(px, py, scale, scale);
+                        }
+                    }
+                }
+            } finally {
+                graphics.dispose();
+            }
+
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            ImageIO.write(image, "png", outputStream);
+            return outputStream.toByteArray();
+        } catch (Exception ex) {
+            throw new IllegalStateException("Unable to generate TWINT QR image.", ex);
+        }
+    }
+}

backend/src/main/java/com/printcalculator/service/email/EmailNotificationService.java

@@ -0,0 +1,17 @@
+package com.printcalculator.service.email;
+
+import java.util.Map;
+
+public interface EmailNotificationService {
+
+    /**
+     * Sends an HTML email using a Thymeleaf template.
+     *
+     * @param to           The recipient email address.
+     * @param subject      The subject of the email.
+     * @param templateName The name of the Thymeleaf template (e.g., "order-confirmation").
+     * @param contextData  The data to populate the template with.
+     */
+    void sendEmail(String to, String subject, String templateName, Map<String, Object> contextData);
+
+}

backend/src/main/java/com/printcalculator/service/email/SmtpEmailNotificationService.java

@@ -0,0 +1,62 @@
+package com.printcalculator.service.email;
+
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SmtpEmailNotificationService implements EmailNotificationService {
+
+    private final JavaMailSender emailSender;
+    private final TemplateEngine templateEngine;
+
+    @Value("${app.mail.from}")
+    private String fromAddress;
+
+    @Value("${app.mail.enabled:true}")
+    private boolean mailEnabled;
+
+    @Override
+    public void sendEmail(String to, String subject, String templateName, Map<String, Object> contextData) {
+        if (!mailEnabled) {
+            log.info("Email sending disabled (app.mail.enabled=false). Skipping email to {}", to);
+            return;
+        }
+
+        log.info("Preparing to send email to {} with template {}", to, templateName);
+
+        try {
+            Context context = new Context();
+            context.setVariables(contextData);
+
+            String process = templateEngine.process("email/" + templateName, context);
+            MimeMessage mimeMessage = emailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
+
+            helper.setFrom(fromAddress);
+            helper.setTo(to);
+            helper.setSubject(subject);
+            helper.setText(process, true); // true indicates HTML format
+
+            emailSender.send(mimeMessage);
+            log.info("Email successfully sent to {}", to);
+
+        } catch (MessagingException e) {
+            log.error("Failed to send email to {}", to, e);
+            // Non blocco l'ordine se l'email fallisce, ma loggo l'errore adeguatamente.
+        } catch (Exception e) {
+            log.error("Unexpected error while sending email to {}", to, e);
+        }
+    }
+}

backend/src/main/resources/application-local.properties

@@ -0,0 +1,2 @@
+app.mail.enabled=false
+app.mail.admin.enabled=false

backend/src/main/resources/application.properties

@@ -18,3 +18,26 @@ profiles.root=${PROFILES_DIR:profiles}
 # File Upload Limits
 spring.servlet.multipart.max-file-size=200MB
 spring.servlet.multipart.max-request-size=200MB
+
+# ClamAV Configuration
+clamav.host=${CLAMAV_HOST:clamav}
+clamav.port=${CLAMAV_PORT:3310}
+clamav.enabled=${CLAMAV_ENABLED:false}
+
+# TWINT Configuration
+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}
+spring.mail.port=${MAIL_PORT:587}
+spring.mail.username=${MAIL_USERNAME:info@3d-fab.ch}
+spring.mail.password=${MAIL_PASSWORD:ht*44k+Tq39R+R-O}
+spring.mail.properties.mail.smtp.auth=${MAIL_SMTP_AUTH:false}
+spring.mail.properties.mail.smtp.starttls.enable=${MAIL_SMTP_STARTTLS:false}
+
+# Application Mail Settings
+app.mail.enabled=${APP_MAIL_ENABLED:true}
+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.frontend.base-url=${APP_FRONTEND_BASE_URL:http://localhost:4200}

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

@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <title>Conferma Ordine</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;
+        }
+        .order-details {
+            background-color: #f9f9f9;
+            padding: 15px;
+            border-radius: 5px;
+            margin-top: 20px;
+        }
+        .order-details th {
+            text-align: left;
+            padding-right: 20px;
+            color: #333333;
+        }
+        .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>Grazie per il tuo ordine #<span th:text="${orderNumber}">00000000</span></h1>
+        </div>
+        <div class="content">
+            <p>Ciao <span th:text="${customerName}">Cliente</span>,</p>
+            <p>Abbiamo ricevuto il tuo ordine e stiamo iniziando a elaborarlo. Ecco un riepilogo dei dettagli:</p>
+
+            <div class="order-details">
+                <table>
+                    <tr>
+                        <th>Numero Ordine:</th>
+                        <td th:text="${orderNumber}">00000000</td>
+                    </tr>
+                    <tr>
+                        <th>Data:</th>
+                        <td th:text="${orderDate}">01/01/2026</td>
+                    </tr>
+                    <tr>
+                        <th>Costo totale:</th>
+                        <td th:text="${totalCost} + ' CHF'">0.00 CHF</td>
+                    </tr>
+                </table>
+            </div>
+
+            <p>
+                Clicca qui per i dettagli:
+                <a th:href="${orderDetailsUrl}" th:text="${orderDetailsUrl}">https://tuosito.it/ordine/00000000-0000-0000-0000-000000000000</a>
+            </p>
+
+            <p>Se hai domande o dubbi, non esitare a contattarci.</p>
+        </div>
+        <div class="footer">
+            <p>&copy; 2026 3D-Fab. Tutti i diritti riservati.</p>
+        </div>
+    </div>
+</body>
+</html>

backend/src/main/resources/templates/invoice.html

@@ -0,0 +1,359 @@
+<!DOCTYPE html>
+<html lang="it" xmlns:th="http://www.thymeleaf.org">
+<head>
+  <meta charset="utf-8"/>
+  <style>
+    @page invoice { size: A4; margin: 14mm 14mm 12mm 14mm; }
+    @page qrpage { size: A4; margin: 0; }
+
+    body {
+      page: invoice;
+      font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      font-size: 9.5pt;
+      margin: 0;
+      padding: 0;
+      background: #fff;
+      color: #191919;
+      line-height: 1.35;
+    }
+
+    .invoice-page {
+      page: invoice;
+      width: 100%;
+    }
+
+    .top-layout {
+      width: 100%;
+      border-collapse: collapse;
+      margin-bottom: 8mm;
+    }
+
+    .top-layout td {
+      vertical-align: top;
+      padding: 0;
+    }
+
+    .doc-title {
+      font-size: 18pt;
+      font-weight: 700;
+      margin: 0 0 1.5mm 0;
+      letter-spacing: 0.2px;
+    }
+
+    .doc-subtitle {
+      color: #4b4b4b;
+      font-size: 10pt;
+    }
+
+    .seller-block {
+      text-align: right;
+      line-height: 1.45;
+      width: 42%;
+    }
+
+    .seller-name {
+      font-size: 11pt;
+      font-weight: 700;
+    }
+
+    .meta-layout {
+      width: 100%;
+      border-collapse: collapse;
+      margin-bottom: 8mm;
+    }
+
+    .meta-layout td {
+      vertical-align: top;
+      padding: 0;
+    }
+
+    .order-details {
+      width: 60%;
+      padding-right: 5mm;
+    }
+
+    .customer-box {
+      width: 40%;
+      background: #f7f7f7;
+      border: 1px solid #e2e2e2;
+      padding: 3mm 3.2mm;
+    }
+
+    .box-title {
+      font-size: 8.8pt;
+      text-transform: uppercase;
+      letter-spacing: 0.4px;
+      color: #5a5a5a;
+      margin-bottom: 2mm;
+      font-weight: 700;
+    }
+
+    .details-table {
+      width: 100%;
+      border-collapse: collapse;
+    }
+
+    .details-table td {
+      padding: 1.1mm 0;
+      border-bottom: 1px solid #ececec;
+      vertical-align: top;
+    }
+
+    .details-label {
+      color: #636363;
+      width: 56%;
+      white-space: nowrap;
+      padding-right: 3mm;
+    }
+
+    .details-value {
+      text-align: left;
+      font-weight: 600;
+    }
+
+    .line-items {
+      width: 100%;
+      border-collapse: collapse;
+      table-layout: fixed;
+      margin-top: 3mm;
+      border-top: 1px solid #cfcfcf;
+    }
+
+    .line-items th,
+    .line-items td {
+      border-bottom: 1px solid #dedede;
+      padding: 2.4mm 2mm;
+      vertical-align: top;
+      word-wrap: break-word;
+    }
+
+    .line-items th {
+      text-align: left;
+      font-weight: 700;
+      background: #f2f2f2;
+      color: #2c2c2c;
+      font-size: 9pt;
+      text-transform: uppercase;
+      letter-spacing: 0.25px;
+    }
+
+    .line-items th:nth-child(1),
+    .line-items td:nth-child(1) {
+      width: 50%;
+    }
+
+    .line-items th:nth-child(2),
+    .line-items td:nth-child(2) {
+      width: 10%;
+      text-align: right;
+      white-space: nowrap;
+    }
+
+    .line-items th:nth-child(3),
+    .line-items td:nth-child(3) {
+      width: 20%;
+      text-align: right;
+      white-space: nowrap;
+    }
+
+    .line-items th:nth-child(4),
+    .line-items td:nth-child(4) {
+      width: 20%;
+      text-align: right;
+      white-space: nowrap;
+      font-weight: 600;
+    }
+
+    .summary-layout {
+      width: 100%;
+      border-collapse: collapse;
+      margin-top: 6mm;
+    }
+
+    .summary-layout td {
+      vertical-align: top;
+      padding: 0;
+    }
+
+    .notes {
+      width: 58%;
+      padding-right: 5mm;
+      color: #383838;
+      line-height: 1.45;
+    }
+
+    .notes .section-caption {
+      font-weight: 700;
+      margin: 0 0 1.2mm 0;
+      color: #2a2a2a;
+    }
+
+    .totals {
+      width: 42%;
+      margin-left: auto;
+      border-collapse: collapse;
+    }
+
+    .totals td {
+      border: none;
+      padding: 1.3mm 0;
+    }
+
+    .totals-label {
+      text-align: left;
+      color: #4a4a4a;
+    }
+
+    .totals-value {
+      text-align: right;
+      white-space: nowrap;
+      font-weight: 600;
+    }
+
+    .total-strong td {
+      font-size: 10.5pt;
+      font-weight: 700;
+      padding-top: 2mm;
+      border-top: 1px solid #cfcfcf;
+    }
+
+    .due-row td {
+      font-size: 10pt;
+      font-weight: 700;
+      border-top: 1px solid #cfcfcf;
+      padding-top: 2.2mm;
+    }
+
+    .qr-only-page {
+      page: qrpage;
+      position: relative;
+      width: 210mm;
+      height: 297mm;
+      background: #fff;
+      page-break-before: always;
+    }
+
+    .qr-bill-bottom {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 210mm;
+      height: 105mm;
+      overflow: hidden;
+      background: #fff;
+    }
+
+    .qr-bill-bottom svg {
+      width: 210mm !important;
+      height: 105mm !important;
+      display: block;
+    }
+  </style>
+</head>
+<body>
+<div class="invoice-page">
+
+<table class="top-layout">
+  <tr>
+    <td>
+      <div class="doc-title">Conferma ordine</div>
+      <div class="doc-subtitle">Ricevuta semplificata</div>
+    </td>
+    <td class="seller-block">
+      <div class="seller-name" th:text="${sellerDisplayName}">3D Fab Switzerland</div>
+      <div th:text="${sellerAddressLine1}">Sede Ticino, Svizzera</div>
+      <div th:text="${sellerAddressLine2}">Sede Bienne, Svizzera</div>
+      <div th:text="${sellerEmail}">info@3dfab.ch</div>
+    </td>
+  </tr>
+</table>
+
+<table class="meta-layout">
+  <tr>
+    <td class="order-details">
+      <table class="details-table">
+        <tr>
+          <td class="details-label">Data ordine / fattura</td>
+          <td class="details-value" th:text="${invoiceDate}">2026-02-13</td>
+        </tr>
+        <tr>
+          <td class="details-label">Numero documento</td>
+          <td class="details-value" th:text="${invoiceNumber}">INV-2026-000123</td>
+        </tr>
+        <tr>
+          <td class="details-label">Data di scadenza</td>
+          <td class="details-value" th:text="${dueDate}">2026-02-20</td>
+        </tr>
+        <tr>
+          <td class="details-label">Valuta</td>
+          <td class="details-value">CHF</td>
+        </tr>
+      </table>
+    </td>
+    <td class="customer-box">
+      <div class="box-title">Cliente</div>
+      <div th:text="${buyerDisplayName}">Cliente SA</div>
+      <div th:text="${buyerAddressLine1}">Via Cliente 7</div>
+      <div th:text="${buyerAddressLine2}">8000 Zürich, CH</div>
+    </td>
+  </tr>
+</table>
+
+<table class="line-items">
+  <thead>
+    <tr>
+      <th>Descrizione</th>
+      <th>Qtà</th>
+      <th>Prezzo unit.</th>
+      <th>Totale</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr th:each="lineItem : ${invoiceLineItems}">
+      <td th:text="${lineItem.description}">Stampa 3D pezzo X</td>
+      <td th:text="${lineItem.quantity}">1</td>
+      <td th:text="${lineItem.unitPriceFormatted}">CHF 10.00</td>
+      <td th:text="${lineItem.lineTotalFormatted}">CHF 10.00</td>
+    </tr>
+  </tbody>
+</table>
+
+<table class="summary-layout">
+  <tr>
+    <td class="notes">
+      <div class="section-caption">Informazioni</div>
+      <div th:text="${paymentTermsText}">
+        Appena riceviamo il pagamento l'ordine entra nella coda di stampa. Grazie per la fiducia.
+      </div>
+      <div style="margin-top: 2.5mm;">
+        Verifica i dettagli dell'ordine al ricevimento. Per assistenza, rispondi alla nostra email di conferma.
+      </div>
+    </td>
+    <td>
+      <table class="totals">
+        <tr>
+          <td class="totals-label">Subtotale</td>
+          <td class="totals-value" th:text="${subtotalFormatted}">CHF 10.00</td>
+        </tr>
+        <tr class="total-strong">
+          <td class="totals-label">Totale ordine</td>
+          <td class="totals-value" th:text="${grandTotalFormatted}">CHF 10.00</td>
+        </tr>
+        <tr class="due-row">
+          <td class="totals-label">Importo dovuto</td>
+          <td class="totals-value" th:text="${grandTotalFormatted}">CHF 10.00</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+</div>
+
+<div class="qr-only-page">
+  <div class="qr-bill-bottom" th:utext="${qrBillSvg}">
+  </div>
+</div>
+
+</body>
+</html>

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

@@ -0,0 +1,131 @@
+package com.printcalculator.event.listener;
+
+import com.printcalculator.entity.Customer;
+import com.printcalculator.entity.Order;
+import com.printcalculator.event.OrderCreatedEvent;
+import com.printcalculator.service.email.EmailNotificationService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class OrderEmailListenerTest {
+
+    @Mock
+    private EmailNotificationService emailNotificationService;
+
+    @InjectMocks
+    private OrderEmailListener orderEmailListener;
+
+    @Captor
+    private ArgumentCaptor<Map<String, Object>> templateDataCaptor;
+
+    private Order order;
+    private OrderCreatedEvent event;
+
+    @BeforeEach
+    void setUp() {
+        Customer customer = new Customer();
+        customer.setFirstName("John");
+        customer.setLastName("Doe");
+        customer.setEmail("john.doe@test.com");
+
+        order = new Order();
+        order.setId(UUID.randomUUID());
+        order.setCustomer(customer);
+        order.setCreatedAt(OffsetDateTime.parse("2026-02-21T10:00:00Z"));
+        order.setTotalChf(new BigDecimal("150.50"));
+
+        event = new OrderCreatedEvent(this, order);
+
+        ReflectionTestUtils.setField(orderEmailListener, "adminMailEnabled", true);
+        ReflectionTestUtils.setField(orderEmailListener, "adminMailAddress", "admin@printcalculator.local");
+        ReflectionTestUtils.setField(orderEmailListener, "frontendBaseUrl", "https://tuosito.it");
+    }
+
+    @Test
+    void handleOrderCreatedEvent_ShouldSendCustomerAndAdminEmails() {
+        // Act
+        orderEmailListener.handleOrderCreatedEvent(event);
+
+        // Assert Customer Email
+        verify(emailNotificationService, times(1)).sendEmail(
+                eq("john.doe@test.com"),
+                eq("Conferma Ordine #" + order.getOrderNumber() + " - 3D-Fab"),
+                eq("order-confirmation"),
+                templateDataCaptor.capture()
+        );
+
+        Map<String, Object> customerData = templateDataCaptor.getAllValues().get(0);
+        assertEquals("John", customerData.get("customerName"));
+        assertEquals(order.getId(), customerData.get("orderId"));
+        assertEquals(order.getOrderNumber(), customerData.get("orderNumber"));
+        assertEquals("https://tuosito.it/ordine/" + order.getId(), customerData.get("orderDetailsUrl"));
+        assertEquals(order.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")), customerData.get("orderDate"));
+        assertEquals("150.50", customerData.get("totalCost"));
+
+        // Assert Admin Email
+        verify(emailNotificationService, times(1)).sendEmail(
+                eq("admin@printcalculator.local"),
+                eq("Nuovo Ordine Ricevuto #" + order.getOrderNumber() + " - Doe"),
+                eq("order-confirmation"),
+                templateDataCaptor.capture()
+        );
+
+        Map<String, Object> adminData = templateDataCaptor.getAllValues().get(1);
+        assertEquals("John Doe", adminData.get("customerName"));
+    }
+    
+    @Test
+    void handleOrderCreatedEvent_WithAdminDisabled_ShouldOnlySendCustomerEmail() {
+        // Arrange
+        ReflectionTestUtils.setField(orderEmailListener, "adminMailEnabled", false);
+        
+        // Act
+        orderEmailListener.handleOrderCreatedEvent(event);
+
+        // Assert
+        verify(emailNotificationService, times(1)).sendEmail(
+                eq("john.doe@test.com"),
+                anyString(),
+                anyString(),
+                any()
+        );
+        
+        verify(emailNotificationService, never()).sendEmail(
+                eq("admin@printcalculator.local"),
+                anyString(),
+                anyString(),
+                any()
+        );
+    }
+    
+    @Test
+    void handleOrderCreatedEvent_ExceptionHandling_ShouldNotPropagate() {
+        // Arrange
+        doThrow(new RuntimeException("Simulated Mail Failure"))
+            .when(emailNotificationService).sendEmail(anyString(), anyString(), anyString(), any());
+            
+        // Act & Assert
+        // Event listener shouldn't throw exception back, thus passing the test.
+        orderEmailListener.handleOrderCreatedEvent(event);
+        
+        verify(emailNotificationService, times(1)).sendEmail(anyString(), anyString(), anyString(), any());
+    }
+}

backend/src/test/java/com/printcalculator/service/email/SmtpEmailNotificationServiceTest.java

@@ -0,0 +1,83 @@
+package com.printcalculator.service.email;
+
+import jakarta.mail.internet.MimeMessage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class SmtpEmailNotificationServiceTest {
+
+    @Mock
+    private JavaMailSender emailSender;
+
+    @Mock
+    private TemplateEngine templateEngine;
+
+    @Mock
+    private MimeMessage mimeMessage;
+
+    @InjectMocks
+    private SmtpEmailNotificationService emailNotificationService;
+
+    @BeforeEach
+    void setUp() {
+        ReflectionTestUtils.setField(emailNotificationService, "fromAddress", "noreply@test.com");
+        ReflectionTestUtils.setField(emailNotificationService, "mailEnabled", true);
+    }
+
+    @Test
+    void sendEmail_Success() {
+        // Arrange
+        String to = "user@test.com";
+        String subject = "Test Subject";
+        String templateName = "test-template";
+        Map<String, Object> contextData = new HashMap<>();
+        contextData.put("key", "value");
+
+        when(templateEngine.process(eq("email/" + templateName), any(Context.class))).thenReturn("<html>Test</html>");
+        when(emailSender.createMimeMessage()).thenReturn(mimeMessage);
+
+        // Act
+        emailNotificationService.sendEmail(to, subject, templateName, contextData);
+
+        // Assert
+        verify(templateEngine, times(1)).process(eq("email/" + templateName), any(Context.class));
+        verify(emailSender, times(1)).createMimeMessage();
+        verify(emailSender, times(1)).send(mimeMessage);
+    }
+
+    @Test
+    void sendEmail_Exception_ShouldNotThrow() {
+        // Arrange
+        String to = "user@test.com";
+        String subject = "Test Subject";
+        String templateName = "test-template";
+        Map<String, Object> contextData = new HashMap<>();
+
+        when(templateEngine.process(eq("email/" + templateName), any(Context.class))).thenThrow(new RuntimeException("Template error"));
+
+        // Act & Assert
+        // We expect the exception to be caught and logged, not propagated
+        assertDoesNotThrow(() -> emailNotificationService.sendEmail(to, subject, templateName, contextData));
+        
+        verify(emailSender, never()).createMimeMessage();
+        verify(emailSender, never()).send(any(MimeMessage.class));
+    }
+}

db.sql

@@ -16,11 +16,10 @@ create table printer_machine
 );
 
 create view printer_fleet_current as
-select 1                  as fleet_id,
-       case
+select case
            when sum(fleet_weight) = 0 then null
            else round(sum(power_watts * fleet_weight) / sum(fleet_weight))::integer
-           end            as weighted_average_power_watts,
+           end                as weighted_average_power_watts,
        max(build_volume_x_mm) as fleet_max_build_x_mm,
        max(build_volume_y_mm) as fleet_max_build_y_mm,
        max(build_volume_z_mm) as fleet_max_build_z_mm
@@ -156,54 +155,63 @@ begin;
 
 set timezone = 'Europe/Zurich';
 
-        is_active = excluded.is_active;
+-- =========================================================
+-- 0) (Solo se non esiste) tabella infill_pattern + seed
+-- =========================================================
+-- Se la tabella esiste già, commenta questo blocco.
+create table if not exists infill_pattern
+(
+    infill_pattern_id bigserial primary key,
+    pattern_code      text    not null unique, -- es: grid, gyroid
+    display_name      text    not null,
+    is_active         boolean not null default true
+);
+
+insert into infill_pattern (pattern_code, display_name, is_active)
+values ('grid', 'Grid', true),
+       ('gyroid', 'Gyroid', true)
+on conflict (pattern_code) do update
+    set display_name = excluded.display_name,
+        is_active    = excluded.is_active;
 
 
 -- =========================================================
 -- 1) Pricing policy (valori ESATTI da Excel)
 -- Valid from: 2026-01-01, valid_to: NULL
 -- =========================================================
-insert into pricing_policy (
-    policy_name,
-    valid_from,
-    valid_to,
-    electricity_cost_chf_per_kwh,
-    markup_percent,
-    fixed_job_fee_chf,
-    nozzle_change_base_fee_chf,
-    cad_cost_chf_per_hour,
-    is_active
-) values (
-             'Excel Tariffe 2026-01-01',
-             '2026-01-01 00:00:00+01'::timestamptz,
-             null,
-             0.156,          -- Costo elettricità CHF/kWh (Excel)
-             0.000,          -- Markup non specificato -> 0 (puoi cambiarlo dopo)
-             1.00,           -- Costo fisso macchina CHF (Excel)
-             0.00,           -- Base cambio ugello: non specificato -> 0
-             25.00,          -- Tariffa CAD CHF/h (Excel)
-             true
-         )
+insert into pricing_policy (policy_name,
+                            valid_from,
+                            valid_to,
+                            electricity_cost_chf_per_kwh,
+                            markup_percent,
+                            fixed_job_fee_chf,
+                            nozzle_change_base_fee_chf,
+                            cad_cost_chf_per_hour,
+                            is_active)
+values ('Excel Tariffe 2026-01-01',
+        '2026-01-01 00:00:00+01'::timestamptz,
+        null,
+        0.156, -- Costo elettricità CHF/kWh (Excel)
+        0.000, -- Markup non specificato -> 0 (puoi cambiarlo dopo)
+        1.00, -- Costo fisso macchina CHF (Excel)
+        0.00, -- Base cambio ugello: non specificato -> 0
+        25.00, -- Tariffa CAD CHF/h (Excel)
+        true)
 on conflict do nothing;
 
 -- scaglioni tariffa stampa (Excel)
-insert into pricing_policy_machine_hour_tier (
-    pricing_policy_id,
-    tier_start_hours,
-    tier_end_hours,
-    machine_cost_chf_per_hour
-)
-select
-    p.pricing_policy_id,
-    tiers.tier_start_hours,
-    tiers.tier_end_hours,
-    tiers.machine_cost_chf_per_hour
+insert into pricing_policy_machine_hour_tier (pricing_policy_id,
+                                              tier_start_hours,
+                                              tier_end_hours,
+                                              machine_cost_chf_per_hour)
+select p.pricing_policy_id,
+       tiers.tier_start_hours,
+       tiers.tier_end_hours,
+       tiers.machine_cost_chf_per_hour
 from pricing_policy p
-         cross join (
-    values
-        (0.00::numeric, 10.00::numeric, 2.00::numeric),   -- 0–10 h
-        (10.00::numeric, 20.00::numeric, 1.40::numeric),  -- 10–20 h
-        (20.00::numeric, null::numeric, 0.50::numeric)    -- >20 h
+         cross join (values (0.00::numeric, 10.00::numeric, 2.00::numeric),  -- 0–10 h
+                            (10.00::numeric, 20.00::numeric, 1.40::numeric), -- 10–20 h
+                            (20.00::numeric, null::numeric, 0.50::numeric) -- >20 h
 ) as tiers(tier_start_hours, tier_end_hours, machine_cost_chf_per_hour)
 where p.policy_name = 'Excel Tariffe 2026-01-01'
 on conflict do nothing;
@@ -212,52 +220,45 @@ on conflict do nothing;
 -- =========================================================
 -- 2) Stampante: BambuLab A1
 -- =========================================================
-insert into printer_machine (
-    printer_display_name,
-    build_volume_x_mm,
-    build_volume_y_mm,
-    build_volume_z_mm,
-    power_watts,
-    fleet_weight,
-    is_active
-) values (
-             'BambuLab A1',
-             256,
-             256,
-             256,
-             150,       -- hai detto "150, 140": qui ho messo 150
-             1.000,
-             true
-         )
+insert into printer_machine (printer_display_name,
+                             build_volume_x_mm,
+                             build_volume_y_mm,
+                             build_volume_z_mm,
+                             power_watts,
+                             fleet_weight,
+                             is_active)
+values ('BambuLab A1',
+        256,
+        256,
+        256,
+        150, -- hai detto "150, 140": qui ho messo 150
+        1.000,
+        true)
 on conflict (printer_display_name) do update
-    set
-        build_volume_x_mm = excluded.build_volume_x_mm,
+    set build_volume_x_mm = excluded.build_volume_x_mm,
         build_volume_y_mm = excluded.build_volume_y_mm,
         build_volume_z_mm = excluded.build_volume_z_mm,
-        power_watts = excluded.power_watts,
-        fleet_weight = excluded.fleet_weight,
-        is_active = excluded.is_active;
+        power_watts       = excluded.power_watts,
+        fleet_weight      = excluded.fleet_weight,
+        is_active         = excluded.is_active;
 
 
 -- =========================================================
 -- 3) Material types (da Excel) - per ora niente technical
 -- =========================================================
-insert into filament_material_type (
-    material_code,
-    is_flexible,
-    is_technical,
-    technical_type_label
-) values
-      ('PLA', false, false, null),
-      ('PETG', false, false, null),
-      ('TPU', true,  false, null),
-      ('ABS', false, false, null),
-      ('Nylon', false, false, null),
-      ('Carbon PLA', false, false, null)
+insert into filament_material_type (material_code,
+                                    is_flexible,
+                                    is_technical,
+                                    technical_type_label)
+values ('PLA', false, false, null),
+       ('PETG', false, false, null),
+       ('TPU', true, false, null),
+       ('ABS', false, false, null),
+       ('Nylon', false, false, null),
+       ('Carbon PLA', false, false, null)
 on conflict (material_code) do update
-    set
-        is_flexible = excluded.is_flexible,
-        is_technical = excluded.is_technical,
+    set is_flexible          = excluded.is_flexible,
+        is_technical         = excluded.is_technical,
         technical_type_label = excluded.technical_type_label;
 
 
@@ -268,99 +269,359 @@ on conflict (material_code) do update
 -- =========================================================
 
 -- helper: ID PLA
-with pla as (
-    select filament_material_type_id
-    from filament_material_type
-    where material_code = 'PLA'
-)
-insert into filament_variant (
-    filament_material_type_id,
-    variant_display_name,
-    color_name,
-    is_matte,
-    is_special,
-    cost_chf_per_kg,
-    stock_spools,
-    spool_net_kg,
-    is_active
-)
-select
-    pla.filament_material_type_id,
-    v.variant_display_name,
-    v.color_name,
-    v.is_matte,
-    v.is_special,
-    18.00,                 -- PLA da Excel
-    v.stock_spools,
-    1.000,
-    true
+with pla as (select filament_material_type_id
+             from filament_material_type
+             where material_code = 'PLA')
+insert
+into filament_variant (filament_material_type_id,
+                       variant_display_name,
+                       color_name,
+                       is_matte,
+                       is_special,
+                       cost_chf_per_kg,
+                       stock_spools,
+                       spool_net_kg,
+                       is_active)
+select pla.filament_material_type_id,
+       v.variant_display_name,
+       v.color_name,
+       v.is_matte,
+       v.is_special,
+       18.00, -- PLA da Excel
+       v.stock_spools,
+       1.000,
+       true
 from pla
-         cross join (
-    values
-        ('PLA Bianco', 'Bianco', false, false, 3.000::numeric),
-        ('PLA Nero', 'Nero', false, false, 3.000::numeric),
-        ('PLA Blu', 'Blu', false, false, 1.000::numeric),
-        ('PLA Arancione', 'Arancione', false, false, 1.000::numeric),
-        ('PLA Grigio', 'Grigio', false, false, 1.000::numeric),
-        ('PLA Grigio Scuro', 'Grigio scuro', false, false, 1.000::numeric),
-        ('PLA Grigio Chiaro', 'Grigio chiaro', false, false, 1.000::numeric),
-        ('PLA Viola', 'Viola', false, false, 1.000::numeric)
-) as v(variant_display_name, color_name, is_matte, is_special, stock_spools)
+         cross join (values ('PLA Bianco', 'Bianco', false, false, 3.000::numeric),
+                            ('PLA Nero', 'Nero', false, false, 3.000::numeric),
+                            ('PLA Blu', 'Blu', false, false, 1.000::numeric),
+                            ('PLA Arancione', 'Arancione', false, false, 1.000::numeric),
+                            ('PLA Grigio', 'Grigio', false, false, 1.000::numeric),
+                            ('PLA Grigio Scuro', 'Grigio scuro', false, false, 1.000::numeric),
+                            ('PLA Grigio Chiaro', 'Grigio chiaro', false, false, 1.000::numeric),
+                            ('PLA Viola', 'Viola', false, false,
+                             1.000::numeric)) as v(variant_display_name, color_name, is_matte, is_special, stock_spools)
 on conflict (filament_material_type_id, variant_display_name) do update
-    set
-        color_name = excluded.color_name,
-        is_matte = excluded.is_matte,
-        is_special = excluded.is_special,
+    set color_name      = excluded.color_name,
+        is_matte        = excluded.is_matte,
+        is_special      = excluded.is_special,
         cost_chf_per_kg = excluded.cost_chf_per_kg,
-        stock_spools = excluded.stock_spools,
-        spool_net_kg = excluded.spool_net_kg,
-        is_active = excluded.is_active;
+        stock_spools    = excluded.stock_spools,
+        spool_net_kg    = excluded.spool_net_kg,
+        is_active       = excluded.is_active;
 
 
 -- =========================================================
 -- 5) Ugelli
 -- 0.4 standard (0 extra), 0.6 con attivazione 50 CHF
 -- =========================================================
-insert into nozzle_option (
-    nozzle_diameter_mm,
-    owned_quantity,
-    extra_nozzle_change_fee_chf,
-    is_active
-) values
-      (0.40, 1, 0.00, true),
-      (0.60, 1, 50.00, true)
+insert into nozzle_option (nozzle_diameter_mm,
+                           owned_quantity,
+                           extra_nozzle_change_fee_chf,
+                           is_active)
+values (0.40, 1, 0.00, true),
+       (0.60, 1, 50.00, true)
 on conflict (nozzle_diameter_mm) do update
-    set
-        owned_quantity = excluded.owned_quantity,
+    set owned_quantity              = excluded.owned_quantity,
         extra_nozzle_change_fee_chf = excluded.extra_nozzle_change_fee_chf,
-        is_active = excluded.is_active;
+        is_active                   = excluded.is_active;
 
 
 -- =========================================================
 -- 6) Layer heights (opzioni)
 -- =========================================================
-insert into layer_height_option (
-    layer_height_mm,
-    time_multiplier,
-    is_active
-) values
-      (0.080, 1.000, true),
-      (0.120, 1.000, true),
-      (0.160, 1.000, true),
-      (0.200, 1.000, true),
-      (0.240, 1.000, true),
-      (0.280, 1.000, true)
+insert into layer_height_option (layer_height_mm,
+                                 time_multiplier,
+                                 is_active)
+values (0.080, 1.000, true),
+       (0.120, 1.000, true),
+       (0.160, 1.000, true),
+       (0.200, 1.000, true),
+       (0.240, 1.000, true),
+       (0.280, 1.000, true)
 on conflict (layer_height_mm) do update
-    set
-        time_multiplier = excluded.time_multiplier,
-        is_active = excluded.is_active;
+    set time_multiplier = excluded.time_multiplier,
+        is_active       = excluded.is_active;
 
 commit;
 
 
-
-
 -- Sostituisci __MULTIPLIER__ con il tuo valore (es. 1.10)
 update layer_height_option
 set time_multiplier = 0.1
 where layer_height_mm = 0.080;
+
+
+-- =========================
+-- CUSTOMERS (minimo indispensabile)
+-- =========================
+CREATE TABLE IF NOT EXISTS customers
+(
+    customer_id    uuid PRIMARY KEY     DEFAULT gen_random_uuid(),
+    customer_type  text        NOT NULL CHECK (customer_type IN ('PRIVATE', 'COMPANY')),
+    email          text        NOT NULL,
+    phone          text,
+
+    -- per PRIVATE
+    first_name     text,
+    last_name      text,
+
+    -- per COMPANY
+    company_name   text,
+    contact_person text,
+
+    created_at     timestamptz NOT NULL DEFAULT now(),
+    updated_at     timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS ux_customers_email
+    ON customers (lower(email));
+
+-- =========================
+-- QUOTE SESSIONS (carrello preventivo)
+-- =========================
+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')),
+    pricing_version    text           NOT NULL,
+
+    -- Parametri "globali" (dalla tua UI avanzata)
+    material_code      text           NOT NULL, -- es: PLA, PETG...
+    nozzle_diameter_mm numeric(5, 2),           -- es: 0.40
+    layer_height_mm    numeric(6, 3),           -- es: 0.20
+    infill_pattern     text,                    -- es: grid
+    infill_percent     integer CHECK (infill_percent BETWEEN 0 AND 100),
+    supports_enabled   boolean        NOT NULL DEFAULT false,
+    notes              text,
+
+    setup_cost_chf     numeric(12, 2) NOT NULL DEFAULT 0.00,
+
+    created_at         timestamptz    NOT NULL DEFAULT now(),
+    expires_at         timestamptz    NOT NULL,
+    converted_order_id uuid
+);
+
+CREATE INDEX IF NOT EXISTS ix_quote_sessions_status
+    ON quote_sessions (status);
+
+CREATE INDEX IF NOT EXISTS ix_quote_sessions_expires_at
+    ON quote_sessions (expires_at);
+
+-- =========================
+-- QUOTE LINE ITEMS (1 file = 1 riga)
+-- =========================
+CREATE TABLE IF NOT EXISTS quote_line_items
+(
+    quote_line_item_id uuid PRIMARY KEY     DEFAULT gen_random_uuid(),
+    quote_session_id   uuid        NOT NULL REFERENCES quote_sessions (quote_session_id) ON DELETE CASCADE,
+
+    status             text        NOT NULL CHECK (status IN ('CALCULATING', 'READY', 'FAILED')),
+
+    original_filename  text        NOT NULL,
+    quantity           integer     NOT NULL DEFAULT 1 CHECK (quantity >= 1),
+    color_code         text,  -- es: white/black o codice interno
+
+    -- Output slicing / calcolo
+    bounding_box_x_mm  numeric(10, 3),
+    bounding_box_y_mm  numeric(10, 3),
+    bounding_box_z_mm  numeric(10, 3),
+    print_time_seconds integer CHECK (print_time_seconds >= 0),
+    material_grams     numeric(12, 2) CHECK (material_grams >= 0),
+
+    unit_price_chf     numeric(12, 2) CHECK (unit_price_chf >= 0),
+    pricing_breakdown  jsonb, -- opzionale: costi dettagliati senza creare tabelle
+
+    error_message      text,
+
+    created_at         timestamptz NOT NULL DEFAULT now(),
+    updated_at         timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS ix_quote_line_items_session
+    ON quote_line_items (quote_session_id);
+
+-- Vista utile per totale quote
+CREATE OR REPLACE VIEW quote_session_totals AS
+SELECT qs.quote_session_id,
+       qs.setup_cost_chf +
+       COALESCE(SUM(qli.unit_price_chf * qli.quantity), 0.00) AS total_chf
+FROM quote_sessions qs
+         LEFT JOIN quote_line_items qli
+                   ON qli.quote_session_id = qs.quote_session_id
+                       AND qli.status = 'READY'
+GROUP BY qs.quote_session_id;
+
+-- =========================
+-- ORDERS
+-- =========================
+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),
+
+    status                   text           NOT NULL CHECK (status IN (
+                                                                       'PENDING_PAYMENT', 'PAID', 'IN_PRODUCTION',
+                                                                       'SHIPPED', 'COMPLETED', 'CANCELLED'
+        )),
+
+    customer_id              uuid REFERENCES customers (customer_id),
+    customer_email           text           NOT NULL,
+    customer_phone           text,
+
+    -- Snapshot indirizzo/fatturazione (evita tabella addresses e mantiene storico)
+    billing_customer_type    text           NOT NULL CHECK (billing_customer_type IN ('PRIVATE', 'COMPANY')),
+    billing_first_name       text,
+    billing_last_name        text,
+    billing_company_name     text,
+    billing_contact_person   text,
+
+    billing_address_line1    text           NOT NULL,
+    billing_address_line2    text,
+    billing_zip              text           NOT NULL,
+    billing_city             text           NOT NULL,
+    billing_country_code     char(2)        NOT NULL DEFAULT 'CH',
+
+    shipping_same_as_billing boolean        NOT NULL DEFAULT true,
+    shipping_first_name      text,
+    shipping_last_name       text,
+    shipping_company_name    text,
+    shipping_contact_person  text,
+    shipping_address_line1   text,
+    shipping_address_line2   text,
+    shipping_zip             text,
+    shipping_city            text,
+    shipping_country_code    char(2),
+
+    currency                 char(3)        NOT NULL DEFAULT 'CHF',
+    setup_cost_chf           numeric(12, 2) NOT NULL DEFAULT 0.00,
+    shipping_cost_chf        numeric(12, 2) NOT NULL DEFAULT 0.00,
+    discount_chf             numeric(12, 2) NOT NULL DEFAULT 0.00,
+
+    subtotal_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(),
+    updated_at               timestamptz    NOT NULL DEFAULT now(),
+    paid_at                  timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS ix_orders_status
+    ON orders (status);
+
+CREATE INDEX IF NOT EXISTS ix_orders_customer_email
+    ON orders (lower(customer_email));
+
+-- =========================
+-- ORDER ITEMS (1 file 3D = 1 riga, file salvato su disco)
+-- =========================
+CREATE TABLE IF NOT EXISTS order_items
+(
+    order_item_id        uuid PRIMARY KEY        DEFAULT gen_random_uuid(),
+    order_id             uuid           NOT NULL REFERENCES orders (order_id) ON DELETE CASCADE,
+
+    original_filename    text           NOT NULL,
+    stored_relative_path text           NOT NULL, -- es: orders/<orderId>/3d-files/<orderItemId>/<uuid>.stl
+    stored_filename      text           NOT NULL, -- es: <uuid>.stl
+
+    file_size_bytes      bigint CHECK (file_size_bytes >= 0),
+    mime_type            text,
+    sha256_hex           text,                    -- opzionale, utile anche per dedup interno
+
+    material_code        text           NOT NULL,
+    color_code           text,
+    quantity             integer        NOT NULL DEFAULT 1 CHECK (quantity >= 1),
+
+    -- Snapshot output
+    print_time_seconds   integer CHECK (print_time_seconds >= 0),
+    material_grams       numeric(12, 2) CHECK (material_grams >= 0),
+    unit_price_chf       numeric(12, 2) NOT NULL CHECK (unit_price_chf >= 0),
+    line_total_chf       numeric(12, 2) NOT NULL CHECK (line_total_chf >= 0),
+
+    created_at           timestamptz    NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS ix_order_items_order
+    ON order_items (order_id);
+
+-- =========================
+-- PAYMENTS (supporta più tentativi / metodi)
+-- =========================
+CREATE TABLE IF NOT EXISTS payments
+(
+    payment_id              uuid PRIMARY KEY        DEFAULT gen_random_uuid(),
+    order_id                uuid           NOT NULL REFERENCES orders (order_id) ON DELETE CASCADE,
+
+    method                  text           NOT NULL CHECK (method IN ('QR_BILL', 'BANK_TRANSFER', 'TWINT', 'CARD', 'OTHER')),
+    status                  text           NOT NULL CHECK (status IN ('PENDING', 'REPORTED', 'RECEIVED', 'FAILED', 'CANCELLED', 'REFUNDED')),
+
+    currency                char(3)        NOT NULL DEFAULT 'CHF',
+    amount_chf              numeric(12, 2) NOT NULL CHECK (amount_chf >= 0),
+
+    -- riferimento pagamento (molto utile per QR bill / riconciliazione)
+    payment_reference       text,
+    provider_transaction_id text,
+
+    qr_payload              text, -- se vuoi salvare contenuto QR/Swiss QR bill
+    initiated_at            timestamptz    NOT NULL DEFAULT now(),
+    reported_at             timestamptz,
+    received_at             timestamptz
+);
+
+CREATE INDEX IF NOT EXISTS ix_payments_order
+    ON payments (order_id);
+
+CREATE INDEX IF NOT EXISTS ix_payments_reference
+    ON payments (payment_reference);
+
+-- =========================
+-- CUSTOM QUOTE REQUESTS (preventivo personalizzato, form che hai mostrato)
+-- =========================
+CREATE TABLE IF NOT EXISTS custom_quote_requests
+(
+    request_id     uuid PRIMARY KEY     DEFAULT gen_random_uuid(),
+    request_type   text        NOT NULL, -- es: "PREVENTIVO_PERSONALIZZATO" o come preferisci
+
+    customer_type  text        NOT NULL CHECK (customer_type IN ('PRIVATE', 'COMPANY')),
+    email          text        NOT NULL,
+    phone          text,
+
+    -- PRIVATE
+    name           text,
+
+    -- COMPANY
+    company_name   text,
+    contact_person text,
+
+    message        text        NOT NULL,
+    status         text        NOT NULL CHECK (status IN ('NEW', 'PENDING', 'IN_PROGRESS', 'DONE', 'CLOSED')),
+
+    created_at     timestamptz NOT NULL DEFAULT now(),
+    updated_at     timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS ix_custom_quote_requests_status
+    ON custom_quote_requests (status);
+
+CREATE INDEX IF NOT EXISTS ix_custom_quote_requests_email
+    ON custom_quote_requests (lower(email));
+
+-- Allegati della richiesta (max 15 come UI)
+CREATE TABLE IF NOT EXISTS custom_quote_request_attachments
+(
+    attachment_id        uuid PRIMARY KEY     DEFAULT gen_random_uuid(),
+    request_id           uuid        NOT NULL REFERENCES custom_quote_requests (request_id) ON DELETE CASCADE,
+
+    original_filename    text        NOT NULL,
+    stored_relative_path text        NOT NULL, -- es: quote-requests/<requestId>/attachments/<attachmentId>/<uuid>.stl
+    stored_filename      text        NOT NULL,
+
+    file_size_bytes      bigint CHECK (file_size_bytes >= 0),
+    mime_type            text,
+    sha256_hex           text,
+
+    created_at           timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE INDEX IF NOT EXISTS ix_custom_quote_attachments_request
+    ON custom_quote_request_attachments (request_id);

deploy/envs/dev.env

@@ -7,4 +7,7 @@ TAG=dev
 BACKEND_PORT=18002
 FRONTEND_PORT=18082
 
+CLAMAV_HOST=192.168.1.147
+CLAMAV_PORT=3310
+CLAMAV_ENABLED=true
 

deploy/envs/int.env

@@ -7,4 +7,7 @@ TAG=int
 BACKEND_PORT=18001
 FRONTEND_PORT=18081
 
+CLAMAV_HOST=192.168.1.147
+CLAMAV_PORT=3310
+CLAMAV_ENABLED=true
 

deploy/envs/prod.env

@@ -7,4 +7,7 @@ TAG=prod
 BACKEND_PORT=8000
 FRONTEND_PORT=80
 
+CLAMAV_HOST=192.168.1.147
+CLAMAV_PORT=3310
+CLAMAV_ENABLED=true
 

docker-compose.deploy.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   backend:
     # L'immagine usa il tag specificato nel file .env o passato da riga di comando
@@ -7,18 +5,38 @@ services:
     container_name: print-calculator-backend-${ENV}
     ports:
       - "${BACKEND_PORT}:8000"
-    env_file:
-      - .env
     environment:
+      - SPRING_PROFILES_ACTIVE=${ENV}
       - DB_URL=${DB_URL}
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
+      - CLAMAV_HOST=${CLAMAV_HOST}
+      - CLAMAV_PORT=${CLAMAV_PORT}
+      - CLAMAV_ENABLED=${CLAMAV_ENABLED}
+      - MAIL_HOST=${MAIL_HOST:-mail.infomaniak.com}
+      - MAIL_PORT=${MAIL_PORT:-587}
+      - MAIL_USERNAME=${MAIL_USERNAME:-info@3d-fab.ch}
+      - MAIL_PASSWORD=${MAIL_PASSWORD:-}
+      - MAIL_SMTP_AUTH=${MAIL_SMTP_AUTH:-true}
+      - MAIL_SMTP_STARTTLS=${MAIL_SMTP_STARTTLS:-true}
+      - APP_MAIL_FROM=${APP_MAIL_FROM:-info@3d-fab.ch}
+      - APP_MAIL_ADMIN_ENABLED=${APP_MAIL_ADMIN_ENABLED:-true}
+      - APP_MAIL_ADMIN_ADDRESS=${APP_MAIL_ADMIN_ADDRESS:-info@3d-fab.ch}
       - TEMP_DIR=/app/temp
       - PROFILES_DIR=/app/profiles
     restart: always
-    volumes:
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
+    volumes: 
       - backend_profiles_${ENV}:/app/profiles
-
+      - /mnt/cache/appdata/print-calculator/${ENV}/storage_quotes:/app/storage_quotes
+      - /mnt/cache/appdata/print-calculator/${ENV}/storage_orders:/app/storage_orders
+      - /mnt/cache/appdata/print-calculator/${ENV}/storage_requests:/app/storage_requests
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   frontend:
     image: ${REGISTRY_URL}/${REPO_OWNER}/print-calculator-frontend:${TAG}
@@ -28,6 +46,11 @@ services:
     depends_on:
       - backend
     restart: always
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10m"
+        max-file: "3"
 
 volumes:
   backend_profiles_prod:

docker-compose.yml

@@ -1,41 +1,4 @@
 services:
-  backend:
-    platform: linux/amd64
-    build:
-      context: ./backend
-      platforms:
-        - linux/amd64
-    container_name: print-calculator-backend
-    ports:
-      - "8000:8000"
-    environment:
-      - DB_URL=jdbc:postgresql://db:5432/printcalc
-      - DB_USERNAME=printcalc
-      - DB_PASSWORD=printcalc_secret
-      - SPRING_PROFILES_ACTIVE=local
-      - FILAMENT_COST_PER_KG=22.0
-      - MACHINE_COST_PER_HOUR=2.50
-      - ENERGY_COST_PER_KWH=0.30
-      - PRINTER_POWER_WATTS=150
-      - MARKUP_PERCENT=20
-      - TEMP_DIR=/app/temp
-      - PROFILES_DIR=/app/profiles
-    depends_on:
-      - db
-    restart: unless-stopped
-
-  frontend:
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile.dev
-    container_name: print-calculator-frontend
-    ports:
-      - "80:80"
-    depends_on:
-      - backend
-      - db
-    restart: unless-stopped
-
   db:
     image: postgres:15-alpine
     container_name: print-calculator-db
@@ -49,5 +12,16 @@ services:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
 
+  clamav:
+    platform: linux/amd64
+    image: clamav/clamav:latest
+    container_name: print-calculator-clamav
+    ports:
+      - "3310:3310"
+    volumes:
+      - clamav_db:/var/lib/clamav
+    restart: unless-stopped
+
 volumes:
   postgres_data:
+  clamav_db:

frontend/src/app/app.routes.ts

@@ -25,9 +25,29 @@ export const routes: Routes = [
         path: 'contact', 
         loadChildren: () => import('./features/contact/contact.routes').then(m => m.CONTACT_ROUTES) 
       },
+      {
+        path: 'checkout',
+        loadComponent: () => import('./features/checkout/checkout.component').then(m => m.CheckoutComponent)
+      },
+      {
+        path: 'payment/:orderId',
+        loadComponent: () => import('./features/payment/payment.component').then(m => m.PaymentComponent)
+      },
+      {
+        path: 'ordine/:orderId',
+        loadComponent: () => import('./features/payment/payment.component').then(m => m.PaymentComponent)
+      },
+      {
+        path: 'order-confirmed/:orderId',
+        loadComponent: () => import('./features/order-confirmed/order-confirmed.component').then(m => m.OrderConfirmedComponent)
+      },
       {
         path: '',
         loadChildren: () => import('./features/legal/legal.routes').then(m => m.LEGAL_ROUTES)
+      },
+      {
+        path: '**',
+        redirectTo: ''
       }
     ]
   }

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

@@ -0,0 +1,40 @@
+import { Injectable, inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { environment } from '../../../environments/environment';
+
+export interface QuoteRequestDto {
+  requestType: string;
+  customerType: string;
+  email: string;
+  phone?: string;
+  name?: string;
+  companyName?: string;
+  contactPerson?: string;
+  message: string;
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class QuoteRequestService {
+  private http = inject(HttpClient);
+  private apiUrl = `${environment.apiUrl}/api/custom-quote-requests`;
+
+  createRequest(request: QuoteRequestDto, files: File[]): Observable<any> {
+    const formData = new FormData();
+    
+    // Append Request DTO as JSON Blob
+    const requestBlob = new Blob([JSON.stringify(request)], {
+      type: 'application/json'
+    });
+    formData.append('request', requestBlob);
+    
+    // Append Files
+    files.forEach(file => {
+      formData.append('files', file);
+    });
+
+    return this.http.post(this.apiUrl, formData);
+  }
+}

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

@@ -11,14 +11,6 @@
     <div class="container hero">
         <app-success-state context="calc" (action)="onNewQuote()"></app-success-state>
     </div>
-} @else if (step() === 'details' && result()) {
-    <div class="container">
-        <app-user-details
-            [quote]="result()!"
-            (submitOrder)="onSubmitOrder($event)"
-            (cancel)="onCancelDetails()">
-        </app-user-details>
-    </div>
 } @else {
     <div class="container content-grid">
       <!-- Left Column: Input -->
@@ -54,8 +46,8 @@
             <app-card class="loading-state">
                 <div class="loader-content">
                     <div class="spinner"></div>
-                    <h3 class="loading-title">Analisi in corso...</h3>
-                    <p class="loading-text">Stiamo analizzando la geometria e calcolando il percorso utensile.</p>
+                    <h3 class="loading-title">{{ 'CALC.ANALYZING_TITLE' | translate }}</h3>
+                    <p class="loading-text">{{ 'CALC.ANALYZING_TEXT' | translate }}</p>
                 </div>
             </app-card>
         } @else if (result()) {
@@ -63,7 +55,7 @@
             [result]="result()!" 
             (consult)="onConsult()"
             (proceed)="onProceed()"
-            (itemChange)="uploadForm.updateItemQuantityByName($event.fileName, $event.quantity)"
+            (itemChange)="onItemChange($event)"
           ></app-quote-result>
         } @else {
           <app-card>

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

@@ -1,20 +1,21 @@
 import { Component, signal, ViewChild, ElementRef, OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
+import { forkJoin } from 'rxjs';
+import { 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 { UploadFormComponent } from './components/upload-form/upload-form.component';
 import { QuoteResultComponent } from './components/quote-result/quote-result.component';
 import { QuoteRequest, QuoteResult, QuoteEstimatorService } from './services/quote-estimator.service';
-import { UserDetailsComponent } from './components/user-details/user-details.component';
 import { SuccessStateComponent } from '../../shared/components/success-state/success-state.component';
 import { Router, ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-calculator-page',
   standalone: true,
-  imports: [CommonModule, TranslateModule, AppCardComponent, AppAlertComponent, UploadFormComponent, QuoteResultComponent, UserDetailsComponent, SuccessStateComponent],
+  imports: [CommonModule, TranslateModule, AppCardComponent, AppAlertComponent, UploadFormComponent, QuoteResultComponent, SuccessStateComponent],
   templateUrl: './calculator-page.component.html',
   styleUrl: './calculator-page.component.scss'
 })
@@ -44,6 +45,95 @@ export class CalculatorPageComponent implements OnInit {
         this.mode.set(data['mode']);
       }
     });
+
+    this.route.queryParams.subscribe(params => {
+        const sessionId = params['session'];
+        if (sessionId) {
+            this.loadSession(sessionId);
+        }
+    });
+  }
+
+  loadSession(sessionId: string) {
+      this.loading.set(true);
+      this.estimator.getQuoteSession(sessionId).subscribe({
+          next: (data) => {
+              // 1. Map to Result
+              const result = this.estimator.mapSessionToQuoteResult(data);
+              this.result.set(result);
+              this.step.set('quote');
+              
+              // 2. Determine Mode (Heuristic)
+              // If we have custom settings, maybe Advanced? 
+              // For now, let's stick to current mode or infer from URL if possible.
+              // Actually, we can check if settings deviate from Easy defaults. 
+              // But let's leave it as is or default to Advanced if not sure.
+              // data.session.materialCode etc.
+              
+              // 3. Download Files & Restore Form
+              this.restoreFilesAndSettings(data.session, data.items);
+          },
+          error: (err) => {
+              console.error('Failed to load session', err);
+              this.error.set(true);
+              this.loading.set(false);
+          }
+      });
+  }
+
+  restoreFilesAndSettings(session: any, items: any[]) {
+      if (!items || items.length === 0) {
+           this.loading.set(false);
+           return;
+      }
+
+      // Download all files
+      const downloads = items.map(item => 
+          this.estimator.getLineItemContent(session.id, item.id).pipe(
+              map((blob: Blob) => {
+                  return { 
+                      blob, 
+                      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.
+                  };
+              })
+          )
+      );
+      
+      forkJoin(downloads).subscribe({
+          next: (results: any[]) => {
+              const files = results.map(res => new File([res.blob], res.fileName, { type: 'application/octet-stream' }));
+              
+              if (this.uploadForm) {
+                  this.uploadForm.setFiles(files);
+                  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, item.colorCode);
+                               }
+                           });
+                      }
+                  });
+              }
+              this.loading.set(false);
+          },
+          error: (err: any) => {
+              console.error('Failed to download files', err);
+              this.loading.set(false);
+              // Still show result? Yes.
+          }
+      });
   }
 
   onCalculate(req: QuoteRequest) {
@@ -68,10 +158,21 @@ export class CalculatorPageComponent implements OnInit {
             this.uploadProgress.set(event);
         } else {
             // It's the result
-            this.result.set(event as QuoteResult);
+            const res = event as QuoteResult;
+            this.result.set(res);
             this.loading.set(false);
             this.uploadProgress.set(100);
             this.step.set('quote');
+
+            // Update URL with session ID without reloading
+            if (res.sessionId) {
+                this.router.navigate([], {
+                    relativeTo: this.route,
+                    queryParams: { session: res.sessionId },
+                    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"
+                });
+            }
         }
       },
       error: () => {
@@ -82,13 +183,34 @@ export class CalculatorPageComponent implements OnInit {
   }
 
   onProceed() {
-    this.step.set('details');
+    const res = this.result();
+    if (res && res.sessionId) {
+      this.router.navigate(['/checkout'], { queryParams: { session: res.sessionId } });
+    } else {
+      console.error('No session ID found in quote result');
+      // Fallback or error handling
+    }
   }
 
   onCancelDetails() {
     this.step.set('quote');
   }
 
+  onItemChange(event: {id?: string, fileName: string, quantity: number}) {
+      // 1. Update local form for consistency (UI feedback)
+      if (this.uploadForm) {
+          this.uploadForm.updateItemQuantityByName(event.fileName, event.quantity);
+      }
+      
+      // 2. Update backend session if ID exists
+      if (event.id) {
+          this.estimator.updateLineItem(event.id, { quantity: event.quantity }).subscribe({
+              next: (res) => console.log('Line item updated', res),
+              error: (err) => console.error('Failed to update line item', err)
+          });
+      }
+  }
+
   onSubmitOrder(orderData: any) {
     console.log('Order Submitted:', orderData);
     this.orderSuccess.set(true);

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

@@ -21,7 +21,7 @@
   </div>
 
   <div class="setup-note">
-    <small>* Include {{ result().setupCost | currency:result().currency }} Setup Cost</small>
+    <small>{{ 'CALC.SETUP_NOTE' | translate:{cost: (result().setupCost | currency:result().currency)} }}</small>
   </div>
 
   @if (result().notes) {
@@ -46,7 +46,7 @@
         
         <div class="item-controls">
             <div class="qty-control">
-                <label>Qtà:</label>
+                <label>{{ 'CHECKOUT.QTY' | translate }}:</label>
                 <input 
                     type="number" 
                     min="1" 

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

@@ -18,7 +18,7 @@ export class QuoteResultComponent {
   result = input.required<QuoteResult>();
   consult = output<void>();
   proceed = output<void>();
-  itemChange = output<{fileName: string, quantity: number}>();
+  itemChange = output<{id?: string, fileName: string, quantity: number}>();
 
   // Local mutable state for items to handle quantity changes
   items = signal<QuoteItem[]>([]);
@@ -42,6 +42,7 @@ export class QuoteResultComponent {
       });
       
       this.itemChange.emit({
+          id: this.items()[index].id,
           fileName: this.items()[index].fileName,
           quantity: qty
       });

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

@@ -34,7 +34,7 @@
                     <div class="card-body">
                         <div class="card-controls">
                              <div class="qty-group">
-                                <label>QTÀ</label>
+                                <label>{{ 'CALC.QTY_SHORT' | translate }}</label>
                                 <input 
                                     type="number" 
                                     min="1" 
@@ -45,7 +45,7 @@
                             </div>
 
                             <div class="color-group">
-                                <label>COLORE</label>
+                                <label>{{ 'CALC.COLOR_LABEL' | translate }}</label>
                                 <app-color-selector 
                                     [selectedColor]="item.color" 
                                     [variants]="currentMaterialVariants()"
@@ -134,7 +134,7 @@
   <app-input
     formControlName="notes"
     [label]="'CALC.NOTES' | translate"
-    placeholder="Istruzioni specifiche..."
+    [placeholder]="'CALC.NOTES_PLACEHOLDER' | translate"
   ></app-input>
 
   <div class="actions">
@@ -151,7 +151,7 @@
       type="submit" 
       [disabled]="items().length === 0 || loading()" 
       [fullWidth]="true">
-      {{ loading() ? (uploadProgress() < 100 ? 'Uploading...' : 'Processing...') : ('CALC.CALCULATE' | translate) }}
+      {{ loading() ? (uploadProgress() < 100 ? ('CALC.UPLOADING' | translate) : ('CALC.PROCESSING' | translate)) : ('CALC.CALCULATE' | translate) }}
     </app-button>
   </div>
 </form>

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

@@ -232,6 +232,59 @@ export class UploadFormComponent implements OnInit {
       });
   }
 
+  setFiles(files: File[]) {
+      const validItems: FormItem[] = [];
+      for (const file of files) {
+          // Default color is Black or derive from somewhere if possible, but here we just init
+          validItems.push({ file, quantity: 1, color: 'Black' });
+      }
+
+      if (validItems.length > 0) {
+          this.items.set(validItems);
+          this.form.get('itemsTouched')?.setValue(true);
+          // Auto select last added
+          this.selectedFile.set(validItems[validItems.length - 1].file);
+      }
+  }
+
+  patchSettings(settings: any) {
+      if (!settings) return;
+      // settings object matches keys in our form? 
+      // Session has: materialCode, etc. derived from QuoteSession entity properties
+      // We need to map them if names differ.
+      
+      const patch: any = {};
+      if (settings.materialCode) patch.material = settings.materialCode;
+      
+      // Heuristic for Quality if not explicitly stored as "draft/standard/high"
+      // But we stored it in session creation? 
+      // QuoteSession entity does NOT store "quality" string directly, only layerHeight/infill.
+      // So we might need to deduce it or just set Custom/Advanced.
+      // But for Easy mode, we want to show "Standard" etc.
+      
+      // Actually, let's look at what we have in QuoteSession.
+      // layerHeightMm, infillPercent, etc. 
+      // If we are in Easy mode, we might just set the "quality" dropdown to match approx?
+      // Or if we stored "quality" in notes or separate field? We didn't.
+      
+      // Let's try to reverse map or defaults.
+      if (settings.layerHeightMm) {
+          if (settings.layerHeightMm >= 0.28) patch.quality = 'draft';
+          else if (settings.layerHeightMm <= 0.12) patch.quality = 'high';
+          else patch.quality = 'standard';
+          
+          patch.layerHeight = settings.layerHeightMm;
+      }
+      
+      if (settings.nozzleDiameterMm) patch.nozzleDiameter = settings.nozzleDiameterMm;
+      if (settings.infillPercent) patch.infillDensity = settings.infillPercent;
+      if (settings.infillPattern) patch.infillPattern = settings.infillPattern;
+      if (settings.supportsEnabled !== undefined) patch.supportEnabled = settings.supportsEnabled;
+      if (settings.notes) patch.notes = settings.notes;
+
+      this.form.patchValue(patch);
+  }
+
   onSubmit() {
     console.log('UploadFormComponent: onSubmit triggered');
     console.log('Form Valid:', this.form.valid, 'Items:', this.items().length);

frontend/src/app/features/calculator/components/user-details/user-details.component.html

@@ -9,8 +9,8 @@
             <div class="col-md-6">
               <app-input 
                 formControlName="name"
-                label="USER_DETAILS.NAME" 
-                placeholder="USER_DETAILS.NAME_PLACEHOLDER"
+                [label]="'USER_DETAILS.NAME' | translate" 
+                [placeholder]="'USER_DETAILS.NAME_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('name')?.invalid && form.get('name')?.touched ? ('COMMON.REQUIRED' | translate) : null">
               </app-input>
@@ -18,8 +18,8 @@
             <div class="col-md-6">
               <app-input 
                 formControlName="surname"
-                label="USER_DETAILS.SURNAME" 
-                placeholder="USER_DETAILS.SURNAME_PLACEHOLDER"
+                [label]="'USER_DETAILS.SURNAME' | translate" 
+                [placeholder]="'USER_DETAILS.SURNAME_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('surname')?.invalid && form.get('surname')?.touched ? ('COMMON.REQUIRED' | translate) : null">
               </app-input>
@@ -31,9 +31,9 @@
             <div class="col-md-6">
               <app-input 
                 formControlName="email"
-                label="USER_DETAILS.EMAIL" 
+                [label]="'USER_DETAILS.EMAIL' | translate" 
                 type="email"
-                placeholder="USER_DETAILS.EMAIL_PLACEHOLDER"
+                [placeholder]="'USER_DETAILS.EMAIL_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('email')?.invalid && form.get('email')?.touched ? ('COMMON.INVALID_EMAIL' | translate) : null">
               </app-input>
@@ -41,9 +41,9 @@
             <div class="col-md-6">
               <app-input 
                 formControlName="phone"
-                label="USER_DETAILS.PHONE" 
+                [label]="'USER_DETAILS.PHONE' | translate" 
                 type="tel"
-                placeholder="USER_DETAILS.PHONE_PLACEHOLDER"
+                [placeholder]="'USER_DETAILS.PHONE_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('phone')?.invalid && form.get('phone')?.touched ? ('COMMON.REQUIRED' | translate) : null">
               </app-input>
@@ -53,8 +53,8 @@
           <!-- Address -->
           <app-input 
             formControlName="address"
-            label="USER_DETAILS.ADDRESS" 
-            placeholder="USER_DETAILS.ADDRESS_PLACEHOLDER"
+            [label]="'USER_DETAILS.ADDRESS' | translate" 
+            [placeholder]="'USER_DETAILS.ADDRESS_PLACEHOLDER' | translate"
             [required]="true"
             [error]="form.get('address')?.invalid && form.get('address')?.touched ? ('COMMON.REQUIRED' | translate) : null">
           </app-input>
@@ -64,8 +64,8 @@
             <div class="col-md-4">
               <app-input 
                 formControlName="zip"
-                label="USER_DETAILS.ZIP" 
-                placeholder="USER_DETAILS.ZIP_PLACEHOLDER"
+                [label]="'USER_DETAILS.ZIP' | translate" 
+                [placeholder]="'USER_DETAILS.ZIP_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('zip')?.invalid && form.get('zip')?.touched ? ('COMMON.REQUIRED' | translate) : null">
               </app-input>
@@ -73,8 +73,8 @@
             <div class="col-md-8">
               <app-input 
                 formControlName="city"
-                label="USER_DETAILS.CITY" 
-                placeholder="USER_DETAILS.CITY_PLACEHOLDER"
+                [label]="'USER_DETAILS.CITY' | translate" 
+                [placeholder]="'USER_DETAILS.CITY_PLACEHOLDER' | translate"
                 [required]="true"
                 [error]="form.get('city')?.invalid && form.get('city')?.touched ? ('COMMON.REQUIRED' | translate) : null">
               </app-input>

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

@@ -18,6 +18,7 @@ export interface QuoteRequest {
 }
 
 export interface QuoteItem {
+  id?: string;
   fileName: string;
   unitPrice: number;
   unitTime: number; // seconds
@@ -28,6 +29,7 @@ export interface QuoteItem {
 }
 
 export interface QuoteResult {
+  sessionId?: string;
   items: QuoteItem[];
   setupCost: number;
   currency: string;
@@ -119,6 +121,60 @@ export class QuoteEstimatorService {
           })
       );
   }
+
+  // NEW METHODS for Order Flow
+  
+  getQuoteSession(sessionId: string): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.get(`${environment.apiUrl}/api/quote-sessions/${sessionId}`, { headers });
+  }
+
+  updateLineItem(lineItemId: string, changes: any): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.patch(`${environment.apiUrl}/api/quote-sessions/line-items/${lineItemId}`, changes, { headers });
+  }
+
+  createOrder(sessionId: string, orderDetails: any): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.post(`${environment.apiUrl}/api/orders/from-quote/${sessionId}`, orderDetails, { headers });
+  }
+
+  getOrder(orderId: string): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.get(`${environment.apiUrl}/api/orders/${orderId}`, { headers });
+  }
+
+  reportPayment(orderId: string, method: string): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.post(`${environment.apiUrl}/api/orders/${orderId}/payments/report`, { method }, { headers });
+  }
+
+  getOrderInvoice(orderId: string): Observable<Blob> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.get(`${environment.apiUrl}/api/orders/${orderId}/invoice`, {
+          headers,
+          responseType: 'blob'
+      });
+  }
+
+  getTwintPayment(orderId: string): Observable<any> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.get(`${environment.apiUrl}/api/orders/${orderId}/twint`, { headers });
+  }
   
   calculate(request: QuoteRequest): Observable<number | QuoteResult> {
     console.log('QuoteEstimatorService: Calculating quote...', request);
@@ -128,203 +184,139 @@ export class QuoteEstimatorService {
     }
     
     return new Observable(observer => {
-        const totalItems = request.items.length;
-        const allProgress: number[] = new Array(totalItems).fill(0);
-        const finalResponses: any[] = [];
-        let completedRequests = 0;
+        // 1. Create Session first
+        const headers: any = {};
+        // @ts-ignore
+        if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
 
-        const uploads = request.items.map((item, index) => {
-             const formData = new FormData();
-             formData.append('file', item.file);
-             // machine param removed - backend uses default active
-             
-             // Map material? Or trust frontend to send correct code?
-             // Since we fetch options now, we should send the code directly.
-             // But for backward compat/safety/mapping logic in mapMaterial, let's keep it or update it.
-             // If frontend sends 'PLA', mapMaterial returns 'pla_basic'.
-             // We should check if request.material is already a code from options.
-             // For now, let's assume request.material IS the code if it matches our new options,
-             // or fallback to mapper if it's old legacy string.
-             // Let's keep mapMaterial but update it to be smarter if needed, or rely on UploadForm to send correct codes.
-             // For now, let's use mapMaterial as safety, assuming frontend sends short codes 'PLA'.
-             // Wait, if we use dynamic options, the 'value' in select will be the 'code' from backend (e.g. 'PLA').
-             // Backend expects 'pla_basic' or just 'PLA'? 
-             // QuoteController -> processRequest -> SlicerService.slice -> assumes 'filament' is a profile name like 'pla_basic'.
-             // So we MUST map 'PLA' to 'pla_basic' UNLESS backend options return 'pla_basic' as code.
-             // Backend OptionsController returns type.getMaterialCode() which is 'PLA'.
-             // So we still need mapping to slicer profile names.
-             
-             formData.append('filament', this.mapMaterial(request.material));
-             formData.append('quality', this.mapQuality(request.quality));
-             
-             // Send color for both modes if present, defaulting to Black
-             formData.append('material_color', item.color || 'Black');
+        this.http.post<any>(`${environment.apiUrl}/api/quote-sessions`, {}, { headers }).subscribe({
+            next: (sessionRes) => {
+                const sessionId = sessionRes.id;
+                const sessionSetupCost = sessionRes.setupCostChf || 0;
+                
+                // 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;
 
-             if (request.mode === 'advanced') {
-                if (request.infillDensity) formData.append('infill_density', request.infillDensity.toString());
-                if (request.infillPattern) formData.append('infill_pattern', request.infillPattern);
-                if (request.supportEnabled) formData.append('support_enabled', 'true');
-                if (request.layerHeight) formData.append('layer_height', request.layerHeight.toString());
-                if (request.nozzleDiameter) formData.append('nozzle_diameter', request.nozzleDiameter.toString());
+                const checkCompletion = () => {
+                     const avg = Math.round(allProgress.reduce((a, b) => a + b, 0) / totalItems);
+                     observer.next(avg);
+                     
+                     if (completedRequests === totalItems) {
+                         finalize(finalResponses, sessionSetupCost, sessionId);
+                     }
+                };
+
+                request.items.forEach((item, index) => {
+                     const formData = new FormData();
+                     formData.append('file', item.file);
+                     
+                     const settings = {
+                         complexityMode: request.mode.toUpperCase(),
+                         material: this.mapMaterial(request.material),
+                         quality: request.quality,
+                         supportsEnabled: request.supportEnabled,
+                         color: item.color || '#FFFFFF',
+                         layerHeight: request.mode === 'advanced' ? request.layerHeight : null,
+                         infillDensity: request.mode === 'advanced' ? request.infillDensity : null,
+                         infillPattern: request.mode === 'advanced' ? request.infillPattern : null,
+                         nozzleDiameter: request.mode === 'advanced' ? request.nozzleDiameter : null
+                     };
+        
+                     const settingsBlob = new Blob([JSON.stringify(settings)], { type: 'application/json' });
+                     formData.append('settings', settingsBlob);
+
+                     this.http.post<any>(`${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items`, formData, { 
+                         headers,
+                         reportProgress: true,
+                         observe: 'events'
+                     }).subscribe({
+                        next: (event) => {
+                            if (event.type === HttpEventType.UploadProgress && event.total) {
+                                allProgress[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();
+                            }
+                        },
+                        error: (err) => {
+                            console.error('Item upload failed', err);
+                            finalResponses[index] = { success: false, fileName: item.file.name };
+                            completedRequests++;
+                            checkCompletion();
+                        }
+                    });
+                });
+            },
+            error: (err) => {
+                console.error('Failed to create session', err);
+                observer.error('Could not initialize quote session');
+            }
+        });
+
+        const finalize = (responses: any[], setupCost: number, sessionId: string) => {
+             observer.next(100); 
+             const items: QuoteItem[] = [];
+             let grandTotal = 0;
+             let totalTime = 0;
+             let totalWeight = 0;
+             let validCount = 0;
+
+             responses.forEach((res, idx) => {
+                 if (!res || !res.success) return;
+                 validCount++;
+                 
+                 const unitPrice = res.unitPriceChf || 0;
+                 const quantity = res.originalQty || 1;
+                 
+                 items.push({
+                     id: res.id,
+                     fileName: res.fileName,
+                     unitPrice: unitPrice,
+                     unitTime: res.printTimeSeconds || 0,
+                     unitWeight: res.materialGrams || 0,
+                     quantity: quantity,
+                     material: request.material,
+                     color: res.originalItem.color || 'Default'
+                     // Store ID if needed for updates? QuoteItem interface might need update
+                     // or we map it in component
+                 });
+                 
+                 grandTotal += unitPrice * quantity;
+                 totalTime += (res.printTimeSeconds || 0) * quantity;
+                 totalWeight += (res.materialGrams || 0) * quantity;
+             });
+
+             if (validCount === 0) {
+                 observer.error('All calculations failed.');
+                 return;
              }
              
-             const headers: any = {};
-             // @ts-ignore
-             if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+             grandTotal += setupCost;
 
-             return this.http.post<BackendResponse | BackendQuoteResult>(`${environment.apiUrl}/api/quote`, formData, { 
-                 headers,
-                 reportProgress: true,
-                 observe: 'events'
-             }).pipe(
-                 map(event => ({ item, event, index })),
-                 catchError(err => of({ item, error: err, index }))
-             );
-        });
-
-        // Subscribe to all
-        uploads.forEach((obs) => {
-            obs.subscribe({
-                next: (wrapper: any) => {
-                    const idx = wrapper.index;
-                    
-                    if (wrapper.error) {
-                        finalResponses[idx] = { success: false, fileName: wrapper.item.file.name };
-                    }
-
-                    const event = wrapper.event;
-                    if (event && event.type === HttpEventType.UploadProgress) {
-                        if (event.total) {
-                            const percent = Math.round((100 * event.loaded) / event.total);
-                            allProgress[idx] = percent;
-                            // Emit average progress
-                            const avg = Math.round(allProgress.reduce((a, b) => a + b, 0) / totalItems);
-                            observer.next(avg); 
-                        }
-                    } else if ((event && event.type === HttpEventType.Response) || wrapper.error) { 
-                        // It's done (either response or error caught above)
-                        if (!finalResponses[idx]) { // only if not already set by error
-                             allProgress[idx] = 100;
-                             if (wrapper.error) {
-                                 finalResponses[idx] = { success: false, fileName: wrapper.item.file.name };
-                             } else {
-                                finalResponses[idx] = { ...event.body, fileName: wrapper.item.file.name, originalQty: wrapper.item.quantity };
-                             }
-                             completedRequests++;
-                        }
-                        
-                        if (completedRequests === totalItems) {
-                            // All done
-                            observer.next(100); 
-                            
-                            // Calculate Results
-                            let setupCost = 10;
-                            let setupCostFromBackend: number | null = null;
-                            let currencyFromBackend: string | null = null;
-
-                            if (request.nozzleDiameter && request.nozzleDiameter !== 0.4) {
-                                setupCost += 2;
-                            }
-                            
-                            const items: QuoteItem[] = [];
-                            
-                            finalResponses.forEach((res, idx) => {
-                                if (!res) return;
-                                const originalItem = request.items[idx];
-                                const normalized = this.normalizeResponse(res);
-                                if (!normalized.success) return;
-
-                                if (normalized.currency && currencyFromBackend == null) {
-                                    currencyFromBackend = normalized.currency;
-                                }
-                                if (normalized.setupCost != null && setupCostFromBackend == null) {
-                                    setupCostFromBackend = normalized.setupCost;
-                                }
-
-                                items.push({
-                                    fileName: res.fileName,
-                                    unitPrice: normalized.unitPrice,
-                                    unitTime: normalized.unitTime,
-                                    unitWeight: normalized.unitWeight,
-                                    quantity: res.originalQty, // Use the requested quantity
-                                    material: request.material,
-                                    color: originalItem.color || 'Default'
-                                });
-                            });
-
-                            if (items.length === 0) {
-                                observer.error('All calculations failed.');
-                                return;
-                            }
-                            
-                            // Initial Aggregation
-                            const useBackendSetup = setupCostFromBackend != null;
-                            let grandTotal = useBackendSetup ? 0 : setupCost;
-                            let totalTime = 0;
-                            let totalWeight = 0;
-                            
-                            items.forEach(item => {
-                                grandTotal += item.unitPrice * item.quantity;
-                                totalTime += item.unitTime * item.quantity;
-                                totalWeight += item.unitWeight * item.quantity;
-                            });
-
-                            const totalHours = Math.floor(totalTime / 3600);
-                            const totalMinutes = Math.ceil((totalTime % 3600) / 60);
-
-                            const result: QuoteResult = {
-                                items,
-                                setupCost: useBackendSetup ? setupCostFromBackend! : setupCost,
-                                currency: currencyFromBackend || 'CHF',
-                                totalPrice: Math.round(grandTotal * 100) / 100,
-                                totalTimeHours: totalHours,
-                                totalTimeMinutes: totalMinutes,
-                                totalWeight: Math.ceil(totalWeight),
-                                notes: request.notes
-                            };
-                            
-                            observer.next(result);
-                            observer.complete();
-                        }
-                    }
-                },
-                error: (err) => {
-                    console.error('Error in request subscription', err);
-                    completedRequests++;
-                     if (completedRequests === totalItems) {
-                         observer.error('Requests failed');
-                    }
-                }
-            });
-        });
+             const result: QuoteResult = {
+                 sessionId: sessionId,
+                 items,
+                 setupCost: setupCost,
+                 currency: 'CHF',
+                 totalPrice: Math.round(grandTotal * 100) / 100,
+                 totalTimeHours: Math.floor(totalTime / 3600),
+                 totalTimeMinutes: Math.ceil((totalTime % 3600) / 60),
+                 totalWeight: Math.ceil(totalWeight),
+                 notes: request.notes
+             };
+             
+             observer.next(result);
+             observer.complete();
+        };
     });
   }
 
-  private normalizeResponse(res: any): { success: boolean; unitPrice: number; unitTime: number; unitWeight: number; setupCost?: number; currency?: string } {
-    if (res && typeof res.totalPrice === 'number' && res.stats && typeof res.stats.printTimeSeconds === 'number') {
-      return {
-        success: true,
-        unitPrice: res.totalPrice,
-        unitTime: res.stats.printTimeSeconds,
-        unitWeight: res.stats.filamentWeightGrams,
-        setupCost: res.setupCost,
-        currency: res.currency
-      };
-    }
-
-    if (res && res.success && res.data) {
-      return {
-        success: true,
-        unitPrice: res.data.cost.total,
-        unitTime: res.data.print_time_seconds,
-        unitWeight: res.data.material_grams,
-        currency: 'CHF'
-      };
-    }
-
-    return { success: false, unitPrice: 0, unitTime: 0, unitWeight: 0 };
-  }
-
   private mapMaterial(mat: string): string {
     const m = mat.toUpperCase();
     if (m.includes('PLA')) return 'pla_basic';
@@ -333,13 +325,6 @@ export class QuoteEstimatorService {
     return 'pla_basic';
   }
 
-  private mapQuality(qual: string): string {
-    const q = qual.toLowerCase();
-    if (q.includes('draft')) return 'draft';
-    if (q.includes('high')) return 'extra_fine';
-    return 'standard';
-  }
-
   // Consultation Data Transfer
   private pendingConsultation = signal<{files: File[], message: string} | null>(null);
 
@@ -352,4 +337,45 @@ export class QuoteEstimatorService {
       this.pendingConsultation.set(null); // Clear after reading
       return data;
   }
+
+  // Session File Retrieval
+  getLineItemContent(sessionId: string, lineItemId: string): Observable<Blob> {
+      const headers: any = {};
+      // @ts-ignore
+      if (environment.basicAuth) headers['Authorization'] = 'Basic ' + btoa(environment.basicAuth);
+      return this.http.get(`${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items/${lineItemId}/content`, {
+          headers,
+          responseType: 'blob'
+      });
+  }
+
+  mapSessionToQuoteResult(sessionData: any): QuoteResult {
+      const session = sessionData.session;
+      const 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, 0);
+
+      return {
+          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
+          })),
+          setupCost: session.setupCostChf,
+          currency: 'CHF', // Fixed for now
+          totalPrice: sessionData.grandTotalChf,
+          totalTimeHours: Math.floor(totalTime / 3600),
+          totalTimeMinutes: Math.ceil((totalTime % 3600) / 60),
+          totalWeight: Math.ceil(totalWeight),
+          notes: session.notes
+      };
+  }
 }

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

@@ -0,0 +1,161 @@
+<div class="checkout-page">
+  <div class="container hero">
+    <h1 class="section-title">{{ 'CHECKOUT.TITLE' | translate }}</h1>
+  </div>
+  
+  <div class="container">
+    <div class="checkout-layout">
+      
+      <!-- LEFT COLUMN: Form -->
+      <div class="checkout-form-section">
+        <!-- Error Message -->
+        <div *ngIf="error" class="error-message">
+          {{ error }}
+        </div>
+
+        <form [formGroup]="checkoutForm" (ngSubmit)="onSubmit()" *ngIf="!error">
+          
+          <!-- Contact Info Card -->
+          <app-card class="mb-6">
+            <div class="card-header-simple">
+              <h3>{{ 'CHECKOUT.CONTACT_INFO' | translate }}</h3>
+            </div>
+            <div class="form-row">
+              <app-input formControlName="email" type="email" [label]="'CHECKOUT.EMAIL' | translate" [required]="true" [error]="checkoutForm.get('email')?.hasError('email') ? ('CHECKOUT.INVALID_EMAIL' | translate) : null"></app-input>
+              <app-input formControlName="phone" type="tel" [label]="'CHECKOUT.PHONE' | translate" [required]="true"></app-input>
+            </div>
+          </app-card>
+
+          <!-- Billing Address Card -->
+          <app-card class="mb-6">
+            <div class="card-header-simple">
+              <h3>{{ 'CHECKOUT.BILLING_ADDR' | translate }}</h3>
+            </div>
+            <div formGroupName="billingAddress">
+              
+              <!-- Private Person Fields -->
+              <div *ngIf="!isCompany" class="form-row">
+                <app-input formControlName="firstName" [label]="'CHECKOUT.FIRST_NAME' | translate" [required]="true"></app-input>
+                <app-input formControlName="lastName" [label]="'CHECKOUT.LAST_NAME' | translate" [required]="true"></app-input>
+              </div>
+
+              <!-- Company Fields -->
+              <div *ngIf="isCompany" class="company-fields mb-4">
+                <app-input formControlName="companyName" [label]="'CHECKOUT.COMPANY_NAME' | translate" [required]="true" [placeholder]="'CONTACT.PLACEHOLDER_COMPANY' | translate"></app-input>
+                <app-input formControlName="referencePerson" [label]="'CONTACT.REF_PERSON' | translate" [required]="true" [placeholder]="'CONTACT.PLACEHOLDER_REF_PERSON' | translate"></app-input>
+              </div>
+
+              <!-- User Type Selector -->
+              <div class="user-type-selector">
+                <div class="type-option" [class.selected]="!isCompany" (click)="setCustomerType(false)">
+                  {{ 'CONTACT.TYPE_PRIVATE' | translate }}
+                </div>
+                <div class="type-option" [class.selected]="isCompany" (click)="setCustomerType(true)">
+                  {{ 'CONTACT.TYPE_COMPANY' | translate }}
+                </div>
+              </div>
+              
+              <app-input formControlName="addressLine1" [label]="'CHECKOUT.ADDRESS_1' | translate" [required]="true"></app-input>
+              <app-input formControlName="addressLine2" [label]="'CHECKOUT.ADDRESS_2' | translate"></app-input>
+
+              <div class="form-row three-cols">
+                <app-input formControlName="zip" [label]="'CHECKOUT.ZIP' | translate" [required]="true"></app-input>
+                <app-input formControlName="city" [label]="'CHECKOUT.CITY' | translate" class="city-field" [required]="true"></app-input>
+                <app-input formControlName="countryCode" [label]="'CHECKOUT.COUNTRY' | translate" [disabled]="true" [required]="true"></app-input>
+              </div>
+            </div>
+          </app-card>
+
+          <!-- Shipping Option -->
+          <div class="shipping-option">
+            <label class="checkbox-container">
+              <input type="checkbox" formControlName="shippingSameAsBilling">
+              <span class="checkmark"></span>
+              {{ 'CHECKOUT.SHIPPING_SAME' | translate }}
+            </label>
+          </div>
+
+          <!-- Shipping Address Card (Conditional) -->
+          <app-card *ngIf="!checkoutForm.get('shippingSameAsBilling')?.value" class="mb-6">
+             <div class="card-header-simple">
+              <h3>{{ 'CHECKOUT.SHIPPING_ADDR' | translate }}</h3>
+            </div>
+            <div formGroupName="shippingAddress">
+               <div class="form-row">
+                <app-input formControlName="firstName" [label]="'CHECKOUT.FIRST_NAME' | translate"></app-input>
+                <app-input formControlName="lastName" [label]="'CHECKOUT.LAST_NAME' | translate"></app-input>
+              </div>
+              
+              <div *ngIf="isCompany" class="company-fields">
+                <app-input formControlName="companyName" [label]="'CHECKOUT.COMPANY_OPTIONAL' | translate"></app-input>
+                <app-input formControlName="referencePerson" [label]="'CHECKOUT.REF_PERSON_OPTIONAL' | translate"></app-input>
+              </div>
+
+              <app-input formControlName="addressLine1" [label]="'CHECKOUT.ADDRESS_1' | translate"></app-input>
+              
+              <div class="form-row three-cols">
+                <app-input formControlName="zip" [label]="'CHECKOUT.ZIP' | translate"></app-input>
+                <app-input formControlName="city" [label]="'CHECKOUT.CITY' | translate" class="city-field"></app-input>
+                <app-input formControlName="countryCode" [label]="'CHECKOUT.COUNTRY' | translate" [disabled]="true"></app-input>
+              </div>
+            </div>
+          </app-card>
+
+          <div class="actions">
+            <app-button type="submit" [disabled]="checkoutForm.invalid || isSubmitting()" [fullWidth]="true">
+              {{ (isSubmitting() ? 'CHECKOUT.PROCESSING' : 'CHECKOUT.PLACE_ORDER') | translate }}
+            </app-button>
+          </div>
+
+        </form>
+      </div>
+
+      <!-- RIGHT COLUMN: Order Summary -->
+      <div class="checkout-summary-section">
+        <app-card class="sticky-card">
+          <div class="card-header-simple">
+            <h3>{{ 'CHECKOUT.SUMMARY_TITLE' | translate }}</h3>
+          </div>
+          
+          <div class="summary-items" *ngIf="quoteSession() as session">
+             <div class="summary-item" *ngFor="let item of session.items">
+               <div class="item-details">
+                 <span class="item-name">{{ item.originalFilename }}</span>
+                 <div class="item-specs">
+                   <span>{{ 'CHECKOUT.QTY' | translate }}: {{ item.quantity }}</span> 
+                   <span *ngIf="item.colorCode" class="color-dot" [style.background-color]="item.colorCode"></span>
+                 </div>
+                 <div class="item-specs-sub">
+                   {{ (item.printTimeSeconds / 3600) | number:'1.1-1' }}h | {{ item.materialGrams | number:'1.0-0' }}g
+                 </div>
+               </div>
+               <div class="item-price">
+                 {{ (item.unitPriceChf * item.quantity) | currency:'CHF' }}
+               </div>
+             </div>
+          </div>
+  
+          <div class="summary-totals" *ngIf="quoteSession() as session">
+            <div class="total-row">
+              <span>{{ 'CHECKOUT.SUBTOTAL' | translate }}</span>
+              <span>{{ session.itemsTotalChf | currency:'CHF' }}</span>
+            </div>
+            <div class="total-row">
+              <span>{{ 'CHECKOUT.SETUP_FEE' | translate }}</span>
+              <span>{{ session.session.setupCostChf | currency:'CHF' }}</span>
+            </div>
+            <div class="total-row">
+              <span>{{ 'CHECKOUT.SHIPPING' | translate }}</span>
+              <span>{{ 9.00 | currency:'CHF' }}</span>
+            </div>
+            <div class="grand-total">
+              <span>{{ 'CHECKOUT.TOTAL' | translate }}</span>
+              <span>{{ (session.grandTotalChf + 9.00) | currency:'CHF' }}</span>
+            </div>
+          </div>
+        </app-card>
+      </div>
+
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,299 @@
+.hero { 
+  padding: var(--space-8) 0;
+  text-align: center; 
+
+  .section-title {
+    font-size: 2.5rem;
+    margin-bottom: var(--space-2);
+  }
+}
+
+.checkout-layout {
+  display: grid;
+  grid-template-columns: 1fr 420px;
+  gap: var(--space-8);
+  align-items: start;
+  margin-bottom: var(--space-12);
+
+  @media (max-width: 1024px) {
+    grid-template-columns: 1fr;
+    gap: var(--space-8);
+  }
+}
+
+.card-header-simple {
+  margin-bottom: var(--space-6);
+  padding-bottom: var(--space-4);
+  border-bottom: 1px solid var(--color-border);
+  
+  h3 {
+    font-size: 1.25rem;
+    font-weight: 600;
+    color: var(--color-text);
+    margin: 0;
+  }
+}
+
+.form-row {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-4);
+  margin-bottom: var(--space-4);
+  
+  @media(min-width: 768px) {
+    flex-direction: row;
+    & > * { flex: 1; }
+  }
+
+  &.no-margin {
+    margin-bottom: 0;
+  }
+
+  &.three-cols {
+    display: grid;
+    grid-template-columns: 1.5fr 2fr 1fr;
+    gap: var(--space-4);
+    
+    @media (max-width: 768px) {
+      grid-template-columns: 1fr;
+    }
+  }
+
+  app-input {
+    width: 100%;
+  }
+}
+
+/* User Type Selector - Matching Contact Form Style */
+.user-type-selector {
+  display: flex;
+  background-color: var(--color-neutral-100);
+  border-radius: var(--radius-md);
+  padding: 4px;
+  margin: var(--space-6) 0;
+  gap: 4px;
+  width: 100%;
+  max-width: 400px;
+}
+
+.type-option {
+  flex: 1;
+  text-align: center;
+  padding: 8px 16px;
+  border-radius: var(--radius-sm);
+  cursor: pointer;
+  font-size: 0.875rem;
+  font-weight: 500;
+  color: var(--color-text-muted);
+  transition: all 0.2s ease;
+  user-select: none;
+  
+  &:hover { color: var(--color-text); }
+  
+  &.selected {
+    background-color: var(--color-brand);
+    color: #000;
+    font-weight: 600;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+  }
+}
+
+.company-fields {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-4);
+  padding-left: var(--space-4);
+  border-left: 2px solid var(--color-border);
+  margin-bottom: var(--space-4);
+}
+
+.shipping-option {
+  margin: var(--space-6) 0;
+  padding: var(--space-4);
+  background: var(--color-neutral-100);
+  border-radius: var(--radius-md);
+}
+
+/* Custom Checkbox */
+.checkbox-container {
+  display: flex;
+  align-items: center;
+  position: relative;
+  padding-left: 36px;
+  cursor: pointer;
+  font-size: 1rem;
+  font-weight: 500;
+  user-select: none;
+  color: var(--color-text);
+
+  input {
+    position: absolute;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
+
+    &:checked ~ .checkmark {
+      background-color: var(--color-brand);
+      border-color: var(--color-brand);
+      
+      &:after {
+        display: block;
+      }
+    }
+  }
+
+  .checkmark {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+    height: 24px;
+    width: 24px;
+    background-color: var(--color-bg-card);
+    border: 2px solid var(--color-border);
+    border-radius: var(--radius-sm);
+    transition: all 0.2s;
+
+    &:after {
+      content: "";
+      position: absolute;
+      display: none;
+      left: 7px;
+      top: 3px;
+      width: 6px;
+      height: 12px;
+      border: solid #000;
+      border-width: 0 2.5px 2.5px 0;
+      transform: rotate(45deg);
+    }
+  }
+
+  &:hover input ~ .checkmark {
+    border-color: var(--color-brand);
+  }
+}
+
+.checkout-summary-section {
+  position: relative;
+}
+
+.sticky-card {
+  position: sticky;
+  top: var(--space-6);
+}
+
+.summary-items {
+  margin-bottom: var(--space-6);
+  max-height: 450px;
+  overflow-y: auto;
+  padding-right: var(--space-2);
+  padding-top: var(--space-2);
+
+  &::-webkit-scrollbar {
+    width: 4px;
+  }
+  &::-webkit-scrollbar-thumb {
+    background: var(--color-border);
+    border-radius: 4px;
+  }
+}
+
+.summary-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  padding: var(--space-4) 0;
+  border-bottom: 1px solid var(--color-border);
+
+  &:first-child { padding-top: 0; }
+  &:last-child { border-bottom: none; }
+
+  .item-details {
+    flex: 1;
+    
+    .item-name {
+      display: block;
+      font-weight: 600;
+      font-size: 0.95rem;
+      margin-bottom: var(--space-1);
+      word-break: break-all;
+      color: var(--color-text);
+    }
+
+    .item-specs {
+      display: flex;
+      align-items: center;
+      gap: var(--space-2);
+      font-size: 0.85rem;
+      color: var(--color-text-muted);
+      
+      .color-dot {
+        width: 14px;
+        height: 14px;
+        border-radius: 50%;
+        display: inline-block;
+        border: 1px solid var(--color-border);
+      }
+    }
+    
+    .item-specs-sub {
+      font-size: 0.8rem;
+       color: var(--color-text-muted);
+       margin-top: 2px;
+    }
+  }
+
+  .item-price {
+    font-weight: 600;
+    margin-left: var(--space-3);
+    white-space: nowrap;
+    color: var(--color-text);
+  }
+}
+
+.summary-totals {
+  background: var(--color-neutral-100);
+  padding: var(--space-4);
+  border-radius: var(--radius-md);
+  margin-top: var(--space-6);
+
+  .total-row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: var(--space-2);
+    font-size: 0.95rem;
+    color: var(--color-text);
+  }
+
+  .grand-total {
+    display: flex;
+    justify-content: space-between;
+    color: var(--color-text);
+    font-weight: 700;
+    font-size: 1.5rem;
+    margin-top: var(--space-4);
+    padding-top: var(--space-4);
+    border-top: 2px solid var(--color-border);
+  }
+}
+
+.actions {
+  margin-top: var(--space-8);
+  
+  app-button {
+    width: 100%;
+  }
+}
+
+.error-message {
+  color: var(--color-error);
+  background: #fef2f2;
+  padding: var(--space-4);
+  border-radius: var(--radius-md);
+  margin-bottom: var(--space-6);
+  border: 1px solid #fee2e2;
+  font-weight: 500;
+}
+
+.mb-6 { margin-bottom: var(--space-6); }

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

@@ -0,0 +1,206 @@
+import { Component, inject, OnInit, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { Router, ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { QuoteEstimatorService } from '../calculator/services/quote-estimator.service';
+import { AppInputComponent } from '../../shared/components/app-input/app-input.component';
+import { AppButtonComponent } from '../../shared/components/app-button/app-button.component';
+import { AppCardComponent } from '../../shared/components/app-card/app-card.component';
+
+@Component({
+  selector: 'app-checkout',
+  standalone: true,
+  imports: [
+    CommonModule, 
+    ReactiveFormsModule, 
+    TranslateModule,
+    AppInputComponent,
+    AppButtonComponent,
+    AppCardComponent
+  ],
+  templateUrl: './checkout.component.html',
+  styleUrls: ['./checkout.component.scss']
+})
+export class CheckoutComponent implements OnInit {
+  private fb = inject(FormBuilder);
+  private quoteService = inject(QuoteEstimatorService);
+  private router = inject(Router);
+  private route = inject(ActivatedRoute);
+
+  checkoutForm: FormGroup;
+  sessionId: string | null = null;
+  loading = false;
+  error: string | null = null;
+  isSubmitting = signal(false); // Add signal for submit state
+  quoteSession = signal<any>(null); // Add signal for session details
+
+  constructor() {
+    this.checkoutForm = this.fb.group({
+      email: ['', [Validators.required, Validators.email]],
+      phone: ['', Validators.required],
+      customerType: ['PRIVATE', Validators.required], // Default to PRIVATE
+      
+      shippingSameAsBilling: [true],
+      
+      billingAddress: this.fb.group({
+        firstName: ['', Validators.required],
+        lastName: ['', Validators.required],
+        companyName: [''], 
+        referencePerson: [''],
+        addressLine1: ['', Validators.required],
+        addressLine2: [''],
+        zip: ['', Validators.required],
+        city: ['', Validators.required],
+        countryCode: ['CH', Validators.required]
+      }),
+      
+      shippingAddress: this.fb.group({
+        firstName: [''],
+        lastName: [''],
+        companyName: [''],
+        referencePerson: [''],
+        addressLine1: [''],
+        addressLine2: [''],
+        zip: [''],
+        city: [''],
+        countryCode: ['CH']
+      })
+    });
+  }
+
+  get isCompany(): boolean {
+    return this.checkoutForm.get('customerType')?.value === 'BUSINESS';
+  }
+
+  setCustomerType(isCompany: boolean) {
+    const type = isCompany ? 'BUSINESS' : 'PRIVATE';
+    this.checkoutForm.patchValue({ customerType: type });
+    
+    const billingGroup = this.checkoutForm.get('billingAddress') as FormGroup;
+    const companyControl = billingGroup.get('companyName');
+    const referenceControl = billingGroup.get('referencePerson');
+    const firstNameControl = billingGroup.get('firstName');
+    const lastNameControl = billingGroup.get('lastName');
+    
+    if (isCompany) {
+      companyControl?.setValidators([Validators.required]);
+      referenceControl?.setValidators([Validators.required]);
+      firstNameControl?.clearValidators();
+      lastNameControl?.clearValidators();
+    } else {
+      companyControl?.clearValidators();
+      referenceControl?.clearValidators();
+      firstNameControl?.setValidators([Validators.required]);
+      lastNameControl?.setValidators([Validators.required]);
+    }
+    companyControl?.updateValueAndValidity();
+    referenceControl?.updateValueAndValidity();
+    firstNameControl?.updateValueAndValidity();
+    lastNameControl?.updateValueAndValidity();
+  }
+
+  ngOnInit(): void {
+    this.route.queryParams.subscribe(params => {
+      this.sessionId = params['session'];
+      if (!this.sessionId) {
+        this.error = 'No active session found. Please start a new quote.';
+        this.router.navigate(['/']); // Redirect if no session
+        return;
+      }
+      
+      this.loadSessionDetails();
+    });
+
+    // Toggle shipping validation based on checkbox
+    this.checkoutForm.get('shippingSameAsBilling')?.valueChanges.subscribe(isSame => {
+      const shippingGroup = this.checkoutForm.get('shippingAddress') as FormGroup;
+      if (isSame) {
+        shippingGroup.disable();
+      } else {
+        shippingGroup.enable();
+      }
+    });
+    
+    // Initial state
+    this.checkoutForm.get('shippingAddress')?.disable();
+  }
+
+  loadSessionDetails() {
+      if (!this.sessionId) return; // Ensure sessionId is present before fetching
+      this.quoteService.getQuoteSession(this.sessionId).subscribe({
+          next: (session) => {
+              this.quoteSession.set(session);
+              console.log('Loaded session:', session);
+          },
+          error: (err) => {
+            console.error('Failed to load session', err);
+            this.error = 'Failed to load session details. Please try again.';
+          }
+      });
+  }
+
+  onSubmit() {
+    if (this.checkoutForm.invalid) {
+      return;
+    }
+
+    this.isSubmitting.set(true);
+    this.error = null; // Clear previous errors
+    const formVal = this.checkoutForm.getRawValue(); // Use getRawValue to include disabled fields
+
+    // Construct request object matching backend DTO based on original form structure
+    const orderRequest = {
+      customer: {
+        email: formVal.email,
+        phone: formVal.phone,
+        customerType: formVal.customerType,
+        // Assuming firstName, lastName, companyName for customer come from billingAddress if not explicitly in contact group
+        firstName: formVal.billingAddress.firstName,
+        lastName: formVal.billingAddress.lastName,
+        companyName: formVal.billingAddress.companyName
+      },
+      billingAddress: {
+        firstName: formVal.billingAddress.firstName,
+        lastName: formVal.billingAddress.lastName,
+        companyName: formVal.billingAddress.companyName,
+        contactPerson: formVal.billingAddress.referencePerson,
+        addressLine1: formVal.billingAddress.addressLine1,
+        addressLine2: formVal.billingAddress.addressLine2,
+        zip: formVal.billingAddress.zip,
+        city: formVal.billingAddress.city,
+        countryCode: formVal.billingAddress.countryCode
+      },
+      shippingAddress: formVal.shippingSameAsBilling ? null : {
+        firstName: formVal.shippingAddress.firstName,
+        lastName: formVal.shippingAddress.lastName,
+        companyName: formVal.shippingAddress.companyName,
+        contactPerson: formVal.shippingAddress.referencePerson,
+        addressLine1: formVal.shippingAddress.addressLine1,
+        addressLine2: formVal.shippingAddress.addressLine2,
+        zip: formVal.shippingAddress.zip,
+        city: formVal.shippingAddress.city,
+        countryCode: formVal.shippingAddress.countryCode
+      },
+      shippingSameAsBilling: formVal.shippingSameAsBilling
+    };
+
+    if (!this.sessionId) {
+      this.error = 'No active session found. Cannot create order.';
+      this.isSubmitting.set(false);
+      return;
+    }
+
+    this.quoteService.createOrder(this.sessionId, orderRequest).subscribe({
+      next: (order) => {
+        console.log('Order created', order);
+        this.router.navigate(['/payment', order.id]);
+      },
+      error: (err) => {
+        console.error('Order creation failed', err);
+        this.isSubmitting.set(false);
+        this.error = 'Failed to create order. Please try again.';
+      }
+    });
+  }
+}

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

@@ -37,7 +37,7 @@
       <app-input formControlName="companyName" [label]="('CONTACT.COMPANY_NAME' | translate) + ' *'" [placeholder]="'CONTACT.PLACEHOLDER_COMPANY' | translate"></app-input>
       <app-input formControlName="referencePerson" [label]="('CONTACT.REF_PERSON' | translate) + ' *'" [placeholder]="'CONTACT.PLACEHOLDER_REF_PERSON' | translate"></app-input>
     </div>
-    
+
     <div class="form-group">
       <label>{{ 'CONTACT.LABEL_MESSAGE' | translate }}</label>
       <textarea formControlName="message" class="form-control" rows="4"></textarea>
@@ -47,10 +47,10 @@
     <div class="form-group">
       <label>{{ 'CONTACT.UPLOAD_LABEL' | translate }}</label>
       <p class="hint">{{ 'CONTACT.UPLOAD_HINT' | translate }}</p>
-      
-      <div class="drop-zone" (click)="fileInput.click()" 
+
+      <div class="drop-zone" (click)="fileInput.click()"
            (dragover)="onDragOver($event)" (drop)="onDrop($event)">
-        <input #fileInput type="file" multiple (change)="onFileSelected($event)" hidden 
+        <input #fileInput type="file" multiple (change)="onFileSelected($event)" hidden
                accept=".jpg,.jpeg,.png,.pdf,.stl,.step,.stp,.3mf,.obj">
         <p>{{ 'CONTACT.DROP_FILES' | translate }}</p>
       </div>
@@ -60,8 +60,8 @@
           <button type="button" class="remove-btn" (click)="removeFile(i)">×</button>
           <img *ngIf="file.type === 'image'" [src]="file.url" class="preview-img">
           <div *ngIf="file.type !== 'image'" class="file-icon">
-            <span *ngIf="file.type === 'pdf'">PDF</span>
-            <span *ngIf="file.type === '3d'">3D</span>
+            <span *ngIf="file.type === 'pdf'">{{ 'CONTACT.FILE_TYPE_PDF' | translate }}</span>
+            <span *ngIf="file.type === '3d'">{{ 'CONTACT.FILE_TYPE_3D' | translate }}</span>
           </div>
           <div class="file-name" [title]="file.file.name">{{ file.file.name }}</div>
         </div>

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

@@ -1,10 +1,11 @@
-import { Component, signal, effect } from '@angular/core';
+import { Component, signal, effect, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ReactiveFormsModule, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { AppInputComponent } from '../../../../shared/components/app-input/app-input.component';
 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';
 
 interface FilePreview {
   file: File;
@@ -37,6 +38,8 @@ export class ContactFormComponent {
     { value: 'question', label: 'CONTACT.REQ_TYPE_QUESTION' }
   ];
 
+  private quoteRequestService = inject(QuoteRequestService);
+
   constructor(
       private fb: FormBuilder, 
       private translate: TranslateService,
@@ -156,13 +159,34 @@ export class ContactFormComponent {
 
   onSubmit() {
     if (this.form.valid) {
-      const formData = {
-        ...this.form.value,
-        files: this.files().map(f => f.file)
-      };
-      console.log('Form Submit:', formData);
+      const formVal = this.form.value;
+      const isCompany = formVal.isCompany;
+      
+      const requestDto: any = {
+        requestType: formVal.requestType,
+        customerType: isCompany ? 'BUSINESS' : 'PRIVATE',
+        email: formVal.email,
+        phone: formVal.phone,
+        message: formVal.message
+      };
+
+      if (isCompany) {
+        requestDto.companyName = formVal.companyName;
+        requestDto.contactPerson = formVal.referencePerson;
+      } else {
+        requestDto.name = formVal.name;
+      }
+
+      this.quoteRequestService.createRequest(requestDto, this.files().map(f => f.file)).subscribe({
+        next: () => {
+          this.sent.set(true);
+        },
+        error: (err) => {
+          console.error('Submission failed', err);
+          alert('Error submitting request. Please try again.');
+        }
+      });
       
-      this.sent.set(true);
     } else {
       this.form.markAllAsTouched();
     }

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

@@ -1,7 +1,7 @@
 <section class="contact-hero">
   <div class="container">
     <h1>{{ 'CONTACT.TITLE' | translate }}</h1>
-    <p class="subtitle">Siamo qui per aiutarti. Compila il modulo sottostante per qualsiasi richiesta.</p>
+    <p class="subtitle">{{ 'CONTACT.HERO_SUBTITLE' | translate }}</p>
   </div>
 </section>
 

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

@@ -2,22 +2,18 @@
       <section class="hero">
         <div class="container hero-grid">
           <div class="hero-copy">
-            <p class="eyebrow">Stampa 3D tecnica per aziende, freelance e maker</p>
-            <h1 class="hero-title">
-              Prezzo e tempi in pochi secondi.<br>
-              Dal file 3D al pezzo finito.
-            </h1>
+            <p class="eyebrow">{{ 'HOME.HERO_EYEBROW' | translate }}</p>
+            <h1 class="hero-title" [innerHTML]="'HOME.HERO_TITLE' | translate"></h1>
             <p class="hero-lead">
-              Il calcolatore più avanzato per le tue stampe 3D: precisione assoluta e zero sorprese.
+              {{ 'HOME.HERO_LEAD' | translate }}
             </p>
             <p class="hero-subtitle">
-              Realizziamo pezzi unici e produzioni in serie. Se hai il file, il preventivo è istantaneo. 
-              Se devi ancora crearlo, il nostro team di design lo progetterà per te.
+              {{ 'HOME.HERO_SUBTITLE' | translate }}
             </p>
             <div class="hero-actions">
-              <app-button variant="primary" routerLink="/calculator/basic">Calcola Preventivo</app-button>
-              <app-button variant="outline" routerLink="/shop">Vai allo shop</app-button>
-              <app-button variant="text" routerLink="/contact">Parla con noi</app-button>
+              <app-button variant="primary" routerLink="/calculator/basic">{{ 'HOME.BTN_CALCULATE' | translate }}</app-button>
+              <app-button variant="outline" routerLink="/shop">{{ 'HOME.BTN_SHOP' | translate }}</app-button>
+              <app-button variant="text" routerLink="/contact">{{ 'HOME.BTN_CONTACT' | translate }}</app-button>
             </div>
           </div>
         </div>
@@ -26,31 +22,31 @@
       <section class="section calculator">
         <div class="container calculator-grid">
           <div class="calculator-copy">
-            <h2 class="section-title">Preventivo immediato in pochi secondi</h2>
+            <h2 class="section-title">{{ 'HOME.SEC_CALC_TITLE' | translate }}</h2>
             <p class="section-subtitle">
-              Nessuna registrazione necessaria. Non salviamo il tuo file fino al momento dell'ordine e la stima è effettuata tramite vero slicing.
+              {{ 'HOME.SEC_CALC_SUBTITLE' | translate }}
             </p>
             <ul class="calculator-list">
-              <li>Formati supportati: STL, 3MF, STEP, OBJ</li>
-              <li>Qualità: bozza, standard, alta definizione</li>
+              <li>{{ 'HOME.SEC_CALC_LIST_1' | translate }}</li>
+              <li>{{ 'HOME.SEC_CALC_LIST_2' | translate }}</li>
             </ul>
           </div>
           <app-card class="quote-card">
             <div class="quote-header">
               <div>
-                <p class="quote-eyebrow">Calcolo automatico</p>
-                <h3 class="quote-title">Prezzo e tempi in un click</h3>
+                <p class="quote-eyebrow">{{ 'HOME.CARD_CALC_EYEBROW' | translate }}</p>
+                <h3 class="quote-title">{{ 'HOME.CARD_CALC_TITLE' | translate }}</h3>
               </div>
-              <span class="quote-tag">Senza registrazione</span>
+              <span class="quote-tag">{{ 'HOME.CARD_CALC_TAG' | translate }}</span>
             </div>
             <ul class="quote-steps">
-              <li>Carica il file 3D</li>
-              <li>Scegli materiale e qualità</li>
-              <li>Ricevi subito costo e tempo</li>
+              <li>{{ 'HOME.CARD_CALC_STEP_1' | translate }}</li>
+              <li>{{ 'HOME.CARD_CALC_STEP_2' | translate }}</li>
+              <li>{{ 'HOME.CARD_CALC_STEP_3' | translate }}</li>
             </ul>
             <div class="quote-actions">
-              <app-button variant="primary" [fullWidth]="true" routerLink="/calculator/basic">Apri calcolatore</app-button>
-              <app-button variant="outline" [fullWidth]="true" routerLink="/contact">Parla con noi</app-button>
+              <app-button variant="primary" [fullWidth]="true" routerLink="/calculator/basic">{{ 'HOME.BTN_OPEN_CALC' | translate }}</app-button>
+              <app-button variant="outline" [fullWidth]="true" routerLink="/contact">{{ 'HOME.BTN_CONTACT' | translate }}</app-button>
             </div>
           </app-card>
         </div>
@@ -60,9 +56,9 @@
         <div class="capabilities-bg"></div>
         <div class="container">
           <div class="section-head">
-            <h2 class="section-title">Cosa puoi ottenere</h2>
+            <h2 class="section-title">{{ 'HOME.SEC_CAP_TITLE' | translate }}</h2>
             <p class="section-subtitle">
-              Produzione su misura per prototipi, piccole serie e pezzi personalizzati.
+              {{ 'HOME.SEC_CAP_SUBTITLE' | translate }}
             </p>
           </div>
           <div class="cap-cards">
@@ -70,29 +66,29 @@
               <div class="card-image-placeholder">
                   <!-- <img src="..." alt="..."> -->
               </div>
-              <h3>Prototipazione veloce</h3>
-              <p class="text-muted">Dal file digitale al modello fisico in 24/48 ore. Verifica ergonomia, incastri e funzionamento prima dello stampo definitivo.</p>
+              <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="..." alt="..."> -->
               </div>
-              <h3>Pezzi personalizzati</h3>
-              <p class="text-muted">Componenti unici impossibili da trovare in commercio. Riproduciamo parti rotte o creiamo adattamenti su misura.</p>
+              <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="..." alt="..."> -->
               </div>
-              <h3>Piccole serie</h3>
-              <p class="text-muted">Produzione ponte o serie limitate (10-500 pezzi) con qualità ripetibile. Ideale per validazione di mercato.</p>
+              <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="..." alt="..."> -->
               </div>
-              <h3>Consulenza e CAD</h3>
-              <p class="text-muted">Non hai il file 3D? Ti aiutiamo a progettarlo, ottimizzarlo per la stampa e scegliere il materiale giusto.</p>
+              <h3>{{ 'HOME.CAP_4_TITLE' | translate }}</h3>
+              <p class="text-muted">{{ 'HOME.CAP_4_TEXT' | translate }}</p>
             </app-card>
           </div>
         </div>
@@ -101,33 +97,32 @@
       <section class="section shop">
         <div class="container split">
           <div class="shop-copy">
-            <h2 class="section-title">Shop di soluzioni tecniche pronte</h2>
+            <h2 class="section-title">{{ 'HOME.SEC_SHOP_TITLE' | translate }}</h2>
             <p>
-              Prodotti selezionati, testati in laboratorio e pronti all'uso. Risolvono problemi reali con
-              funzionalità concrete.
+              {{ 'HOME.SEC_SHOP_TEXT' | translate }}
             </p>
             <ul class="shop-list">
-              <li>Accessori funzionali per officine e laboratori</li>
-              <li>Ricambi e componenti difficili da reperire</li>
-              <li>Supporti e organizzatori per migliorare i flussi di lavoro</li>
+              <li>{{ 'HOME.SEC_SHOP_LIST_1' | translate }}</li>
+              <li>{{ 'HOME.SEC_SHOP_LIST_2' | translate }}</li>
+              <li>{{ 'HOME.SEC_SHOP_LIST_3' | translate }}</li>
             </ul>
             <div class="shop-actions">
-              <app-button variant="primary" routerLink="/shop">Scopri i prodotti</app-button>
-              <app-button variant="outline" routerLink="/contact">Richiedi una soluzione</app-button>
+              <app-button variant="primary" routerLink="/shop">{{ 'HOME.BTN_DISCOVER' | translate }}</app-button>
+              <app-button variant="outline" routerLink="/contact">{{ 'HOME.BTN_REQ_SOLUTION' | translate }}</app-button>
             </div>
           </div>
           <div class="shop-cards">
             <app-card>
-              <h3>Best seller tecnici</h3>
-              <p class="text-muted">Soluzioni provate sul campo e già pronte alla spedizione.</p>
+              <h3>{{ 'HOME.CARD_SHOP_1_TITLE' | translate }}</h3>
+              <p class="text-muted">{{ 'HOME.CARD_SHOP_1_TEXT' | translate }}</p>
             </app-card>
             <app-card>
-              <h3>Kit pronti all'uso</h3>
-              <p class="text-muted">Componenti compatibili e facili da montare senza sorprese.</p>
+              <h3>{{ 'HOME.CARD_SHOP_2_TITLE' | translate }}</h3>
+              <p class="text-muted">{{ 'HOME.CARD_SHOP_2_TEXT' | translate }}</p>
             </app-card>
             <app-card>
-              <h3>Su richiesta</h3>
-              <p class="text-muted">Non trovi quello che serve? Lo progettiamo e lo produciamo per te.</p>
+              <h3>{{ 'HOME.CARD_SHOP_3_TITLE' | translate }}</h3>
+              <p class="text-muted">{{ 'HOME.CARD_SHOP_3_TEXT' | translate }}</p>
             </app-card>
           </div>
         </div>
@@ -136,17 +131,16 @@
       <section class="section about">
         <div class="container about-grid">
           <div class="about-copy">
-            <h2 class="section-title">Su di noi</h2>
+            <h2 class="section-title">{{ 'HOME.SEC_ABOUT_TITLE' | translate }}</h2>
             <p>
-              3D fab è un laboratorio tecnico di stampa 3D. Seguiamo progetti dalla consulenza iniziale
-              alla produzione, con tempi chiari e supporto diretto.
+              {{ 'HOME.SEC_ABOUT_TEXT' | translate }}
             </p>
-            <app-button variant="outline" routerLink="/contact">Contattaci</app-button>
+            <app-button variant="outline" routerLink="/contact">{{ 'HOME.BTN_CONTACT' | translate }}</app-button>
           </div>
           <div class="about-media">
             <div class="about-feature-image">
               <!-- Foto founders -->
-              <span class="text-sm">Foto Founders</span>
+              <span class="text-sm">{{ 'HOME.FOUNDERS_PHOTO' | translate }}</span>
             </div>
           </div>
         </div>

frontend/src/app/features/order-confirmed/order-confirmed.component.html

@@ -0,0 +1,52 @@
+<div class="container hero">
+  <h1>{{ 'ORDER_CONFIRMED.TITLE' | translate }}</h1>
+  <p class="subtitle">{{ 'ORDER_CONFIRMED.SUBTITLE' | translate }}</p>
+</div>
+
+<div class="container">
+  <div class="confirmation-layout" *ngIf="order() as o">
+    <app-card class="status-card">
+      <div class="status-badge">{{ o.status === 'SHIPPED' ? ('TRACKING.STEP_SHIPPED' | translate) : ('ORDER_CONFIRMED.STATUS' | translate) }}</div>
+      <h2>{{ 'ORDER_CONFIRMED.HEADING' | translate }}</h2>
+      <p class="order-ref" *ngIf="orderNumber">
+        {{ 'ORDER_CONFIRMED.ORDER_REF' | translate }}: <strong>#{{ orderNumber }}</strong>
+      </p>
+
+      <div class="status-timeline">
+         <div class="timeline-step" 
+              [class.active]="o.status === 'PENDING_PAYMENT' && o.paymentStatus !== 'REPORTED'" 
+              [class.completed]="o.paymentStatus === 'REPORTED' || o.status !== 'PENDING_PAYMENT'">
+            <div class="circle">1</div>
+            <div class="label">{{ 'TRACKING.STEP_PENDING' | translate }}</div>
+         </div>
+         <div class="timeline-step" 
+              [class.active]="o.paymentStatus === 'REPORTED' && o.status === 'PENDING_PAYMENT'" 
+              [class.completed]="o.status === 'PAID' || o.status === 'IN_PRODUCTION' || o.status === 'SHIPPED' || o.status === 'COMPLETED'">
+            <div class="circle">2</div>
+            <div class="label">{{ 'TRACKING.STEP_REPORTED' | translate }}</div>
+         </div>
+         <div class="timeline-step" 
+              [class.active]="o.status === 'PAID' || o.status === 'IN_PRODUCTION'" 
+              [class.completed]="o.status === 'SHIPPED' || o.status === 'COMPLETED'">
+            <div class="circle">3</div>
+            <div class="label">{{ 'TRACKING.STEP_PRODUCTION' | translate }}</div>
+         </div>
+         <div class="timeline-step" 
+              [class.active]="o.status === 'SHIPPED'" 
+              [class.completed]="o.status === 'COMPLETED'">
+            <div class="circle">4</div>
+            <div class="label">{{ 'TRACKING.STEP_SHIPPED' | translate }}</div>
+         </div>
+      </div>
+
+      <div class="message-block">
+        <p>{{ 'ORDER_CONFIRMED.PROCESSING_TEXT' | translate }}</p>
+        <p>{{ 'ORDER_CONFIRMED.EMAIL_TEXT' | translate }}</p>
+      </div>
+
+      <div class="actions">
+        <app-button (click)="goHome()">{{ 'ORDER_CONFIRMED.BACK_HOME' | translate }}</app-button>
+      </div>
+    </app-card>
+  </div>
+</div>

frontend/src/app/features/order-confirmed/order-confirmed.component.scss

@@ -0,0 +1,159 @@
+.hero {
+  padding: var(--space-12) 0 var(--space-8);
+  text-align: center;
+
+  h1 {
+    font-size: 2.4rem;
+    margin-bottom: var(--space-2);
+  }
+}
+
+.subtitle {
+  font-size: 1.1rem;
+  color: var(--color-text-muted);
+  max-width: 720px;
+  margin: 0 auto;
+}
+
+.confirmation-layout {
+  max-width: 760px;
+  margin: 0 auto var(--space-12);
+}
+
+.status-badge {
+  display: inline-block;
+  padding: 0.35rem 0.65rem;
+  border-radius: 999px;
+  background: #eef8f0;
+  color: #136f2d;
+  font-weight: 700;
+  font-size: 0.85rem;
+  margin-bottom: var(--space-4);
+}
+
+h2 {
+  margin: 0 0 var(--space-3);
+}
+
+.order-ref {
+  margin: 0 0 var(--space-4);
+  color: var(--color-text-muted);
+}
+
+.message-block {
+  background: var(--color-neutral-100);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius-md);
+  padding: var(--space-5);
+  margin-bottom: var(--space-6);
+
+  p {
+    margin: 0;
+    line-height: 1.45;
+  }
+
+  p + p {
+    margin-top: var(--space-3);
+  }
+}
+
+.actions {
+  max-width: 320px;
+}
+
+.status-timeline {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: var(--space-6);
+  position: relative;
+  
+  &::before {
+    content: '';
+    position: absolute;
+    top: 15px;
+    left: 20px;
+    right: 20px;
+    height: 2px;
+    background: var(--color-border);
+    z-index: 1;
+  }
+}
+
+.timeline-step {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+  z-index: 2;
+  flex: 1;
+  text-align: center;
+
+  .circle {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    background: var(--color-neutral-100);
+    border: 2px solid var(--color-border);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 600;
+    margin-bottom: var(--space-2);
+    color: var(--color-text-muted);
+    transition: all 0.3s ease;
+  }
+
+  .label {
+    font-size: 0.85rem;
+    color: var(--color-text-muted);
+    font-weight: 500;
+  }
+
+  &.active {
+    .circle {
+      border-color: var(--color-primary);
+      background: var(--color-primary-light);
+      color: var(--color-primary);
+    }
+    .label {
+      color: var(--color-text);
+      font-weight: 600;
+    }
+  }
+
+  &.completed {
+    .circle {
+      background: var(--color-primary);
+      border-color: var(--color-primary);
+      color: white;
+    }
+    .label {
+      color: var(--color-text);
+    }
+  }
+}
+
+@media (max-width: 600px) {
+  .status-timeline {
+    flex-direction: column;
+    align-items: flex-start;
+    gap: var(--space-4);
+    
+    &::before {
+      top: 10px;
+      bottom: 10px;
+      left: 15px;
+      width: 2px;
+      height: auto;
+    }
+
+    .timeline-step {
+      flex-direction: row;
+      gap: var(--space-3);
+      
+      .circle {
+        margin-bottom: 0;
+      }
+    }
+  }
+}

frontend/src/app/features/order-confirmed/order-confirmed.component.ts

@@ -0,0 +1,50 @@
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ActivatedRoute, Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { AppButtonComponent } from '../../shared/components/app-button/app-button.component';
+import { AppCardComponent } from '../../shared/components/app-card/app-card.component';
+import { QuoteEstimatorService } from '../calculator/services/quote-estimator.service';
+
+@Component({
+  selector: 'app-order-confirmed',
+  standalone: true,
+  imports: [CommonModule, TranslateModule, AppButtonComponent, AppCardComponent],
+  templateUrl: './order-confirmed.component.html',
+  styleUrl: './order-confirmed.component.scss'
+})
+export class OrderConfirmedComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private quoteService = inject(QuoteEstimatorService);
+
+  orderId: string | null = null;
+  orderNumber: string | null = null;
+  order = signal<any>(null);
+
+  ngOnInit(): void {
+    this.orderId = this.route.snapshot.paramMap.get('orderId');
+    if (!this.orderId) {
+      return;
+    }
+
+    this.orderNumber = this.extractOrderNumber(this.orderId);
+    this.quoteService.getOrder(this.orderId).subscribe({
+      next: (order) => {
+        this.order.set(order);
+        this.orderNumber = order?.orderNumber ?? this.orderNumber;
+      },
+      error: () => {
+        // Keep fallback derived from UUID when API is unavailable.
+      }
+    });
+  }
+
+  goHome(): void {
+    this.router.navigate(['/']);
+  }
+
+  private extractOrderNumber(orderId: string): string {
+    return orderId.split('-')[0];
+  }
+}

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

@@ -0,0 +1,129 @@
+<div class="container hero">
+  <h1>{{ 'PAYMENT.TITLE' | translate }}</h1>
+  <p class="subtitle">{{ 'CHECKOUT.SUBTITLE' | translate }}</p>
+</div>
+
+<div class="container">
+  <div class="payment-layout" *ngIf="order() as o">
+    <div class="payment-main">
+      <app-card class="mb-6 status-reported-card" *ngIf="o.paymentStatus === 'REPORTED'">
+        <div class="status-content text-center">
+          <h3>{{ 'PAYMENT.STATUS_REPORTED_TITLE' | translate }}</h3>
+          <p>{{ 'PAYMENT.STATUS_REPORTED_DESC' | translate }}</p>
+        </div>
+      </app-card>
+
+      <app-card class="mb-6">
+        <div class="card-header-simple">
+          <h3>{{ 'PAYMENT.METHOD' | translate }}</h3>
+        </div>
+
+        <div class="payment-selection">
+          <div class="methods-grid">
+            <div
+              class="type-option"
+              [class.selected]="selectedPaymentMethod === 'twint'"
+              (click)="selectPayment('twint')">
+              <span class="method-name">{{ 'PAYMENT.METHOD_TWINT' | translate }}</span>
+            </div>
+            <div
+              class="type-option"
+              [class.selected]="selectedPaymentMethod === 'bill'"
+              (click)="selectPayment('bill')">
+              <span class="method-name">{{ 'PAYMENT.METHOD_BANK' | translate }}</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="payment-details fade-in text-center" *ngIf="selectedPaymentMethod === 'twint'">
+          <div class="details-header">
+            <h4>{{ 'PAYMENT.TWINT_TITLE' | translate }}</h4>
+          </div>
+          <div class="qr-placeholder">
+            <img
+              *ngIf="twintQrUrl()"
+              class="twint-qr"
+              [src]="getTwintQrUrl()"
+              (error)="onTwintQrError()"
+              alt="TWINT payment QR" />
+            <p>{{ 'PAYMENT.TWINT_DESC' | translate }}</p>
+            <p class="billing-hint">{{ 'PAYMENT.BILLING_INFO_HINT' | translate }}</p>
+            <div class="twint-mobile-action">
+              <app-button variant="outline" (click)="openTwintPayment()" [fullWidth]="true">
+                {{ 'PAYMENT.TWINT_OPEN' | translate }}
+              </app-button>
+            </div>
+            <p class="amount">{{ 'PAYMENT.TOTAL' | translate }}: {{ o.totalChf | currency:'CHF' }}</p>
+          </div>
+        </div>
+
+        <div class="payment-details fade-in" *ngIf="selectedPaymentMethod === 'bill'">
+          <div class="details-header">
+            <h4>{{ 'PAYMENT.BANK_TITLE' | translate }}</h4>
+          </div>
+          <div class="bank-details">
+            <p><strong>{{ 'PAYMENT.BANK_OWNER' | translate }}:</strong> 3D Fab Switzerland</p>
+            <p><strong>{{ 'PAYMENT.BANK_IBAN' | translate }}:</strong> CH98 0000 0000 0000 0000 0</p>
+            <p><strong>{{ 'PAYMENT.BANK_REF' | translate }}:</strong> {{ getDisplayOrderNumber(o) }}</p>
+            <p class="billing-hint">{{ 'PAYMENT.BILLING_INFO_HINT' | translate }}</p>
+
+            <div class="qr-bill-actions">
+              <app-button variant="outline" (click)="downloadInvoice()">
+                {{ 'PAYMENT.DOWNLOAD_QR' | translate }}
+              </app-button>
+            </div>
+          </div>
+        </div>
+
+        <div class="actions">
+          <app-button 
+            (click)="completeOrder()" 
+            [disabled]="!selectedPaymentMethod || o.paymentStatus === 'REPORTED'" 
+            [fullWidth]="true">
+            {{ o.paymentStatus === 'REPORTED' ? ('PAYMENT.IN_VERIFICATION' | translate) : ('PAYMENT.CONFIRM' | translate) }}
+          </app-button>
+        </div>
+      </app-card>
+    </div>
+
+    <div class="payment-summary">
+      <app-card class="sticky-card">
+        <div class="card-header-simple">
+          <h3>{{ 'PAYMENT.SUMMARY_TITLE' | translate }}</h3>
+          <p class="order-id">#{{ getDisplayOrderNumber(o) }}</p>
+        </div>
+
+        <div class="summary-totals">
+          <div class="total-row">
+            <span>{{ 'PAYMENT.SUBTOTAL' | translate }}</span>
+            <span>{{ o.subtotalChf | currency:'CHF' }}</span>
+          </div>
+          <div class="total-row">
+            <span>{{ 'PAYMENT.SHIPPING' | translate }}</span>
+            <span>{{ o.shippingCostChf | currency:'CHF' }}</span>
+          </div>
+          <div class="total-row">
+            <span>{{ 'PAYMENT.SETUP_FEE' | translate }}</span>
+            <span>{{ o.setupCostChf | currency:'CHF' }}</span>
+          </div>
+          <div class="grand-total-row">
+            <span>{{ 'PAYMENT.TOTAL' | translate }}</span>
+            <span>{{ o.totalChf | currency:'CHF' }}</span>
+          </div>
+        </div>
+      </app-card>
+    </div>
+  </div>
+
+  <div *ngIf="loading()" class="loading-state">
+    <app-card>
+      <p>{{ 'PAYMENT.LOADING' | translate }}</p>
+    </app-card>
+  </div>
+
+  <div *ngIf="error()" class="error-message">
+    <app-card>
+      <p>{{ error() }}</p>
+    </app-card>
+  </div>
+</div>

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

@@ -0,0 +1,236 @@
+.hero {
+  padding: var(--space-12) 0 var(--space-8);
+  text-align: center;
+
+  h1 {
+    font-size: 2.5rem;
+    margin-bottom: var(--space-2);
+  }
+}
+
+.subtitle {
+  font-size: 1.125rem;
+  color: var(--color-text-muted);
+  max-width: 600px;
+  margin: 0 auto;
+}
+
+.payment-layout {
+  display: grid;
+  grid-template-columns: 1fr 400px;
+  gap: var(--space-8);
+  align-items: start;
+  margin-bottom: var(--space-12);
+
+  @media (max-width: 1024px) {
+    grid-template-columns: 1fr;
+    gap: var(--space-8);
+  }
+}
+
+.card-header-simple {
+  margin-bottom: var(--space-6);
+  padding-bottom: var(--space-4);
+  border-bottom: 1px solid var(--color-border);
+
+  h3 {
+    font-size: 1.25rem;
+    font-weight: 600;
+    color: var(--color-text);
+    margin: 0;
+  }
+
+  .order-id {
+    font-size: 0.875rem;
+    color: var(--color-text-muted);
+    margin-top: 2px;
+  }
+}
+
+.payment-selection {
+  margin-bottom: var(--space-6);
+}
+
+.methods-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: var(--space-4);
+
+  @media (max-width: 600px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+.type-option {
+  border: 2px solid var(--color-border);
+  border-radius: var(--radius-md);
+  padding: var(--space-6);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  background: var(--color-bg-card);
+  text-align: center;
+  font-weight: 600;
+  color: var(--color-text-muted);
+
+  &:hover {
+    border-color: var(--color-brand);
+    color: var(--color-text);
+  }
+
+  &.selected {
+    border-color: var(--color-brand);
+    background-color: var(--color-neutral-100);
+    color: #000;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  }
+}
+
+.payment-details {
+  background: var(--color-neutral-100);
+  border-radius: var(--radius-md);
+  padding: var(--space-6);
+  margin-bottom: var(--space-6);
+  border: 1px solid var(--color-border);
+
+  &.text-center {
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+
+    .details-header {
+      width: 100%;
+      text-align: center;
+    }
+    
+    .qr-placeholder {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      text-align: center;
+    }
+  }
+
+  .details-header {
+    margin-bottom: var(--space-4);
+    h4 {
+      margin: 0;
+      font-size: 1.1rem;
+      font-weight: 600;
+    }
+  }
+}
+
+
+.qr-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+
+  .twint-qr {
+    width: 240px;
+    height: 240px;
+    background-color: #fff;
+    border: 1px solid var(--color-border);
+    border-radius: var(--radius-md);
+    padding: var(--space-2);
+    margin-bottom: var(--space-4);
+    object-fit: contain;
+    box-shadow: 0 6px 18px rgba(44, 37, 84, 0.08);
+  }
+
+  .twint-mobile-action {
+    width: 100%;
+    max-width: 320px;
+    margin-top: var(--space-3);
+  }
+
+  .amount {
+    font-size: 1.25rem;
+    font-weight: 700;
+    margin-top: var(--space-2);
+    color: var(--color-text);
+  }
+}
+
+.billing-hint {
+  margin-top: var(--space-3);
+  font-size: 0.95rem;
+  color: var(--color-text-muted);
+}
+
+.bank-details {
+  p {
+    margin-bottom: var(--space-2);
+    font-size: 1rem;
+    color: var(--color-text);
+  }
+}
+
+.qr-bill-actions {
+  margin-top: var(--space-4);
+}
+
+.sticky-card {
+  position: sticky;
+  top: var(--space-6);
+}
+
+.summary-totals {
+  background: var(--color-neutral-100);
+  padding: var(--space-6);
+  border-radius: var(--radius-md);
+
+  .total-row {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: var(--space-2);
+    font-size: 0.95rem;
+    color: var(--color-text-muted);
+  }
+
+  .grand-total-row {
+    display: flex;
+    justify-content: space-between;
+    color: var(--color-text);
+    font-weight: 700;
+    font-size: 1.5rem;
+    margin-top: var(--space-4);
+    padding-top: var(--space-4);
+    border-top: 2px solid var(--color-border);
+  }
+}
+
+.actions {
+  margin-top: var(--space-8);
+}
+
+.fade-in {
+  animation: fadeIn 0.4s ease-out;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(-5px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.mb-6 { margin-bottom: var(--space-6); }
+
+.error-message,
+.loading-state {
+  margin-top: var(--space-12);
+  text-align: center;
+}

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

@@ -0,0 +1,150 @@
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AppButtonComponent } from '../../shared/components/app-button/app-button.component';
+import { AppCardComponent } from '../../shared/components/app-card/app-card.component';
+import { QuoteEstimatorService } from '../calculator/services/quote-estimator.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { environment } from '../../../environments/environment';
+
+@Component({
+  selector: 'app-payment',
+  standalone: true,
+  imports: [CommonModule, AppButtonComponent, AppCardComponent, TranslateModule],
+  templateUrl: './payment.component.html',
+  styleUrl: './payment.component.scss'
+})
+export class PaymentComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private quoteService = inject(QuoteEstimatorService);
+
+  orderId: string | null = null;
+  selectedPaymentMethod: 'twint' | 'bill' | null = null;
+  order = signal<any>(null);
+  loading = signal(true);
+  error = signal<string | null>(null);
+  twintOpenUrl = signal<string | null>(null);
+  twintQrUrl = signal<string | null>(null);
+
+  ngOnInit(): void {
+    this.orderId = this.route.snapshot.paramMap.get('orderId');
+    if (this.orderId) {
+      this.loadOrder();
+      this.loadTwintPayment();
+    } else {
+      this.error.set('Order ID not found.');
+      this.loading.set(false);
+    }
+  }
+
+  loadOrder() {
+    if (!this.orderId) return;
+    this.quoteService.getOrder(this.orderId).subscribe({
+      next: (order) => {
+        this.order.set(order);
+        this.loading.set(false);
+      },
+      error: (err) => {
+        console.error('Failed to load order', err);
+        this.error.set('Failed to load order details.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  selectPayment(method: 'twint' | 'bill'): void {
+    this.selectedPaymentMethod = method;
+  }
+
+  downloadInvoice() {
+    const orderId = this.orderId;
+    if (!orderId) return;
+    this.quoteService.getOrderInvoice(orderId).subscribe({
+      next: (blob) => {
+        const url = window.URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        const fallbackOrderNumber = this.extractOrderNumber(orderId);
+        const orderNumber = this.order()?.orderNumber ?? fallbackOrderNumber;
+        a.download = `invoice-${orderNumber}.pdf`;
+        a.click();
+        window.URL.revokeObjectURL(url);
+      },
+      error: (err) => console.error('Failed to download invoice', err)
+    });
+  }
+
+  loadTwintPayment() {
+    if (!this.orderId) return;
+    this.quoteService.getTwintPayment(this.orderId).subscribe({
+      next: (res) => {
+        const qrPath = typeof res.qrImageUrl === 'string' ? `${res.qrImageUrl}?size=360` : null;
+        const qrDataUri = typeof res.qrImageDataUri === 'string' ? res.qrImageDataUri : null;
+        this.twintOpenUrl.set(this.resolveApiUrl(res.openUrl));
+        this.twintQrUrl.set(qrDataUri ?? this.resolveApiUrl(qrPath));
+      },
+      error: (err) => {
+        console.error('Failed to load TWINT payment details', err);
+      }
+    });
+  }
+
+  openTwintPayment(): void {
+    const openUrl = this.twintOpenUrl();
+    if (typeof window !== 'undefined' && openUrl) {
+      window.open(openUrl, '_blank');
+    }
+  }
+
+  getTwintQrUrl(): string {
+    return this.twintQrUrl() ?? '';
+  }
+
+  onTwintQrError(): void {
+    this.twintQrUrl.set(null);
+  }
+
+  private resolveApiUrl(urlOrPath: string | null | undefined): string | null {
+    if (!urlOrPath) return null;
+    if (urlOrPath.startsWith('http://') || urlOrPath.startsWith('https://')) {
+      return urlOrPath;
+    }
+    const base = (environment.apiUrl || '').replace(/\/$/, '');
+    const path = urlOrPath.startsWith('/') ? urlOrPath : `/${urlOrPath}`;
+    return `${base}${path}`;
+  }
+
+  completeOrder(): void {
+    if (!this.orderId || !this.selectedPaymentMethod) {
+      return;
+    }
+    
+    this.quoteService.reportPayment(this.orderId, this.selectedPaymentMethod).subscribe({
+      next: (order) => {
+        this.order.set(order);
+        // The UI will re-render and show the 'REPORTED' state.
+        // We stay on this page to let the user see the "In verifica" 
+        // status along with payment instructions.
+      },
+      error: (err) => {
+        console.error('Failed to report payment', err);
+        this.error.set('Failed to report payment. Please try again.');
+      }
+    });
+  }
+
+  getDisplayOrderNumber(order: any): string {
+    if (order?.orderNumber) {
+      return order.orderNumber;
+    }
+    if (order?.id) {
+      return this.extractOrderNumber(order.id);
+    }
+    return 'N/A';
+  }
+
+  private extractOrderNumber(orderId: string): string {
+    return orderId.split('-')[0];
+  }
+}

frontend/src/app/features/shop/product-detail.component.html

@@ -20,6 +20,6 @@
       </div>
     </div>
   } @else {
-    <p>Prodotto non trovato.</p>
+    <p>{{ 'SHOP.NOT_FOUND' | translate }}</p>
   }
 </div>

frontend/src/app/shared/components/app-button/app-button.component.scss

@@ -32,12 +32,14 @@
 
 .btn-outline {
   background-color: transparent;
-  border-color: var(--color-border);
-  color: var(--color-text);
+  border-color: var(--color-brand);
+  border-width: 2px;
+  padding: calc(0.5rem - 1px) calc(1rem - 1px);
+  color: var(--color-neutral-900);
+  font-weight: 600;
   &:hover:not(:disabled) { 
-    border-color: var(--color-brand); 
+    background-color: var(--color-brand); 
     color: var(--color-neutral-900);
-    background-color: rgba(250, 207, 10, 0.1); /* Low opacity brand color */
   }
 }
 

frontend/src/app/shared/components/app-input/app-input.component.scss

@@ -1,6 +1,6 @@
 .form-group { display: flex; flex-direction: column; margin-bottom: var(--space-4); }
 label { font-size: 0.875rem; font-weight: 500; margin-bottom: var(--space-2); color: var(--color-text); }
-.required-mark { color: var(--color-danger-500); margin-left: 2px; }
+.required-mark { color: var(--color-text); margin-left: 2px; }
 .form-control {
   padding: 0.5rem 0.75rem;
   border: 1px solid var(--color-border);

frontend/src/app/shared/components/stl-viewer/stl-viewer.component.ts

@@ -25,6 +25,7 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
   private controls!: OrbitControls;
   private animationId: number | null = null;
   private currentMesh: THREE.Mesh | null = null;
+  private autoRotate = true;
 
   loading = false;
 
@@ -38,14 +39,14 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
     }
     
     if (changes['color'] && this.currentMesh && !changes['file']) {
-        // Update existing mesh color if only color changed
-        const mat = this.currentMesh.material as THREE.MeshPhongMaterial;
-        mat.color.set(this.color);
+      this.applyColorStyle(this.color);
     }
   }
 
   ngOnDestroy() {
     if (this.animationId) cancelAnimationFrame(this.animationId);
+    this.clearCurrentMesh();
+    if (this.controls) this.controls.dispose();
     if (this.renderer) this.renderer.dispose();
   }
 
@@ -54,28 +55,51 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
     const height = this.rendererContainer.nativeElement.clientHeight;
 
     this.scene = new THREE.Scene();
-    this.scene.background = new THREE.Color(0xf7f6f2); // Neutral-50
+    this.scene.background = new THREE.Color(0xf4f8fc);
 
     // Lights
-    const ambientLight = new THREE.AmbientLight(0xffffff, 0.6);
+    const ambientLight = new THREE.AmbientLight(0xffffff, 0.75);
     this.scene.add(ambientLight);
 
-    const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
-    directionalLight.position.set(1, 1, 1);
-    this.scene.add(directionalLight);
+    const hemiLight = new THREE.HemisphereLight(0xf8fbff, 0xc8d3df, 0.95);
+    hemiLight.position.set(0, 30, 0);
+    this.scene.add(hemiLight);
+
+    const directionalLight1 = new THREE.DirectionalLight(0xffffff, 1.35);
+    directionalLight1.position.set(6, 8, 6);
+    this.scene.add(directionalLight1);
+
+    const directionalLight2 = new THREE.DirectionalLight(0xe8f0ff, 0.85);
+    directionalLight2.position.set(-7, 4, -5);
+    this.scene.add(directionalLight2);
+
+    const directionalLight3 = new THREE.DirectionalLight(0xffffff, 0.55);
+    directionalLight3.position.set(0, 5, -9);
+    this.scene.add(directionalLight3);
 
     // Camera
     this.camera = new THREE.PerspectiveCamera(50, width / height, 0.1, 1000);
     this.camera.position.z = 100;
 
     // Renderer
-    this.renderer = new THREE.WebGLRenderer({ antialias: true });
+    this.renderer = new THREE.WebGLRenderer({ antialias: true, alpha: false, powerPreference: 'high-performance' });
+    this.renderer.setPixelRatio(Math.min(window.devicePixelRatio || 1, 2));
+    this.renderer.outputColorSpace = THREE.SRGBColorSpace;
+    this.renderer.toneMapping = THREE.ACESFilmicToneMapping;
+    this.renderer.toneMappingExposure = 1.2;
     this.renderer.setSize(width, height);
     this.rendererContainer.nativeElement.appendChild(this.renderer.domElement);
 
     // Controls
     this.controls = new OrbitControls(this.camera, this.renderer.domElement);
     this.controls.enableDamping = true;
+    this.controls.dampingFactor = 0.06;
+    this.controls.enablePan = false;
+    this.controls.minDistance = 10;
+    this.controls.maxDistance = 600;
+    this.controls.addEventListener('start', () => {
+      this.autoRotate = false;
+    });
 
     this.animate();
 
@@ -95,24 +119,27 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
 
   private loadFile(file: File) {
     this.loading = true;
+    this.autoRotate = true;
     const reader = new FileReader();
     reader.onload = (event) => {
       try {
         const loader = new STLLoader();
         const geometry = loader.parse(event.target?.result as ArrayBuffer);
         
-        if (this.currentMesh) {
-          this.scene.remove(this.currentMesh);
-          this.currentMesh.geometry.dispose();
-        }
+        this.clearCurrentMesh();
 
-        const material = new THREE.MeshPhongMaterial({ 
-          color: this.color, 
-          specular: 0x111111,
-          shininess: 200 
+        geometry.computeVertexNormals();
+
+        const material = new THREE.MeshStandardMaterial({
+          color: this.color,
+          roughness: 0.42,
+          metalness: 0.05,
+          emissive: 0x000000,
+          emissiveIntensity: 0
         });
         
         this.currentMesh = new THREE.Mesh(geometry, material);
+        this.applyColorStyle(this.color);
         
         // Center geometry
         geometry.computeBoundingBox();
@@ -140,9 +167,10 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
         
         // Calculate distance towards camera (z-axis)
         let cameraZ = Math.abs(maxDim / 2 / Math.tan(fov / 2));
-        cameraZ *= 1.5; // Tighter zoom (reduced from 2.5)
+        cameraZ *= 1.72;
         
-        this.camera.position.z = cameraZ;
+        this.camera.position.set(cameraZ * 0.65, cameraZ * 0.95, cameraZ * 1.1);
+        this.camera.lookAt(0, 0, 0);
         this.camera.updateProjectionMatrix();
         this.controls.update();
         
@@ -157,9 +185,63 @@ export class StlViewerComponent implements OnInit, OnDestroy, OnChanges {
 
   private animate() {
     this.animationId = requestAnimationFrame(() => this.animate());
+    
+    if (this.currentMesh && this.autoRotate) {
+      this.currentMesh.rotation.z += 0.0025;
+    }
+
     if (this.controls) this.controls.update();
     if (this.renderer && this.scene && this.camera) {
         this.renderer.render(this.scene, this.camera);
     }
   }
+
+  private clearCurrentMesh() {
+    if (!this.currentMesh) {
+      return;
+    }
+
+    this.scene.remove(this.currentMesh);
+    this.currentMesh.geometry.dispose();
+
+    const meshMaterial = this.currentMesh.material;
+    if (Array.isArray(meshMaterial)) {
+      meshMaterial.forEach((m) => m.dispose());
+    } else {
+      meshMaterial.dispose();
+    }
+
+    this.currentMesh = null;
+  }
+
+  private applyColorStyle(color: string) {
+    if (!this.currentMesh) {
+      return;
+    }
+
+    const darkColor = this.isDarkColor(color);
+    const meshMaterial = this.currentMesh.material;
+
+    if (meshMaterial instanceof THREE.MeshStandardMaterial) {
+      meshMaterial.color.set(color);
+      if (darkColor) {
+        meshMaterial.emissive.set(0x2a2f36);
+        meshMaterial.emissiveIntensity = 0.28;
+        meshMaterial.roughness = 0.5;
+        meshMaterial.metalness = 0.03;
+      } else {
+        meshMaterial.emissive.set(0x000000);
+        meshMaterial.emissiveIntensity = 0;
+        meshMaterial.roughness = 0.42;
+        meshMaterial.metalness = 0.05;
+      }
+      meshMaterial.needsUpdate = true;
+    }
+  }
+
+  private isDarkColor(color: string): boolean {
+    const c = new THREE.Color(color);
+    const luminance = 0.2126 * c.r + 0.7152 * c.g + 0.0722 * c.b;
+    return luminance < 0.22;
+  }
 }

frontend/src/assets/i18n/en.json

@@ -148,5 +148,73 @@
     "SUCCESS_TITLE": "Message Sent Successfully",
     "SUCCESS_DESC": "Thank you for contacting us. We have received your message and will send you a recap email shortly.",
     "SEND_ANOTHER": "Send Another Message"
+  },
+  "CHECKOUT": {
+    "TITLE": "Checkout",
+    "SUBTITLE": "Complete your order by entering the shipping and payment details.",
+    "CONTACT_INFO": "Contact Information",
+    "BILLING_ADDR": "Billing Address",
+    "SHIPPING_ADDR": "Shipping Address",
+    "FIRST_NAME": "First Name",
+    "LAST_NAME": "Last Name",
+    "EMAIL": "Email",
+    "PHONE": "Phone",
+    "COMPANY_NAME": "Company Name",
+    "ADDRESS_1": "Address Line 1",
+    "ADDRESS_2": "Address Line 2 (Optional)",
+    "ZIP": "ZIP Code",
+    "CITY": "City",
+    "COUNTRY": "Country",
+    "SHIPPING_SAME": "Shipping address same as billing",
+    "PLACE_ORDER": "Place Order",
+    "PROCESSING": "Processing...",
+    "SUMMARY_TITLE": "Order Summary",
+    "SUBTOTAL": "Subtotal",
+    "SETUP_FEE": "Setup Fee",
+    "TOTAL": "Total",
+    "QTY": "Qty",
+    "SHIPPING": "Shipping"
+  },
+  "PAYMENT": {
+    "TITLE": "Payment",
+    "METHOD": "Payment Method",
+    "TWINT_TITLE": "Pay with TWINT",
+    "TWINT_DESC": "Scan the code with your TWINT app",
+    "TWINT_OPEN": "Open directly in TWINT",
+    "TWINT_LINK": "Open payment link",
+    "BANK_TITLE": "Bank Transfer",
+    "BANK_OWNER": "Owner",
+    "BANK_IBAN": "IBAN",
+    "BANK_REF": "Reference",
+    "BILLING_INFO_HINT": "Add the same information used in billing.",
+    "DOWNLOAD_QR": "Download QR-Invoice (PDF)",
+    "CONFIRM": "Confirm Order",
+    "SUMMARY_TITLE": "Order Summary",
+    "SUBTOTAL": "Subtotal",
+    "SHIPPING": "Shipping",
+    "SETUP_FEE": "Setup Fee",
+    "TOTAL": "Total",
+    "LOADING": "Loading order details...",
+    "METHOD_TWINT": "TWINT",
+    "METHOD_BANK": "Bank Transfer / QR",
+    "STATUS_REPORTED_TITLE": "Payment Reported",
+    "STATUS_REPORTED_DESC": "We are verifying your transaction. Your order will move to production as soon as the payment is confirmed.",
+    "IN_VERIFICATION": "Verifying Payment"
+  },
+  "TRACKING": {
+    "STEP_PENDING": "Pending",
+    "STEP_REPORTED": "Verifying",
+    "STEP_PRODUCTION": "Production",
+    "STEP_SHIPPED": "Shipped"
+  },
+  "ORDER_CONFIRMED": {
+    "TITLE": "Order Confirmed",
+    "SUBTITLE": "Payment received. Your order is now being processed.",
+    "STATUS": "Processing",
+    "HEADING": "We are preparing your order",
+    "ORDER_REF": "Order reference",
+    "PROCESSING_TEXT": "As soon as payment is confirmed, your order will move to production.",
+    "EMAIL_TEXT": "We will send you an email update with status and next steps.",
+    "BACK_HOME": "Back to Home"
   }
 }