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

backend/build.gradle

@@ -25,12 +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

@@ -3,12 +3,14 @@ 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/controller/CustomQuoteRequestController.java

@@ -25,14 +25,17 @@ 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) {
+                                        CustomQuoteRequestAttachmentRepository attachmentRepo,
+                                        com.printcalculator.service.ClamAVService clamAVService) {
         this.requestRepo = requestRepo;
         this.attachmentRepo = attachmentRepo;
+        this.clamAVService = clamAVService;
     }
 
     // 1. Create Custom Quote Request
@@ -68,6 +71,9 @@ public class CustomQuoteRequestController {
             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());

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

@@ -1,13 +1,19 @@
 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 com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -15,200 +21,72 @@ 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.Optional;
+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;
 
-    // TODO: Inject Storage Service or use a base path property
-    private static final String STORAGE_ROOT = "storage_orders"; 
 
-    public OrderController(OrderRepository orderRepo,
+    public OrderController(OrderService orderService,
+                           OrderRepository orderRepo,
                            OrderItemRepository orderItemRepo,
                            QuoteSessionRepository quoteSessionRepo,
                            QuoteLineItemRepository quoteLineItemRepo,
-                           CustomerRepository customerRepo) {
+                           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<Order> createOrderFromQuote(
+    public ResponseEntity<OrderDto> createOrderFromQuote(
             @PathVariable UUID quoteSessionId,
             @RequestBody com.printcalculator.dto.CreateOrderRequest request
     ) {
-        // 1. Fetch Quote Session
-        QuoteSession session = quoteSessionRepo.findById(quoteSessionId)
-                .orElseThrow(() -> new RuntimeException("Quote Session not found"));
-
-        if (!"ACTIVE".equals(session.getStatus())) {
-             // Allow converting only active sessions? Or check if not already converted?
-             // checking convertedOrderId might be better
-        }
-        if (session.getConvertedOrderId() != null) {
-            return ResponseEntity.badRequest().body(null); // Already converted
-        }
-
-        // 2. Handle Customer (Find or Create)
-        Customer customer = customerRepo.findByEmail(request.getCustomer().getEmail())
-                .orElseGet(() -> {
-                    Customer newC = new Customer();
-                    newC.setEmail(request.getCustomer().getEmail());
-                    newC.setCreatedAt(OffsetDateTime.now());
-                    return customerRepo.save(newC);
-                });
-        // Update customer details?
-        customer.setPhone(request.getCustomer().getPhone());
-        customer.setCustomerType(request.getCustomer().getCustomerType());
-        customer.setUpdatedAt(OffsetDateTime.now());
-        customerRepo.save(customer);
-
-        // 3. Create Order
-        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");
-
-        // Billing
-        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");
-        }
-
-        // Shipping
-        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 {
-            // Copy billing to shipping? Or leave empty and rely on flag?
-            // Usually explicit copy is safer for queries
-            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());
-        }
-
-        // Financials from Session (Assuming mocked/calculated in session)
-        // We re-calculate totals from line items to be safe
-        List<QuoteLineItem> quoteItems = quoteLineItemRepo.findByQuoteSessionId(quoteSessionId);
-        
-        BigDecimal subtotal = BigDecimal.ZERO;
-        
-        // Save Order first to get ID
-        order = orderRepo.save(order);
-
-        // 4. Create Order Items
-        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()); // Or per item if supported
-            
-            // Pricing
-            oItem.setUnitPriceChf(qItem.getUnitPriceChf());
-            oItem.setLineTotalChf(qItem.getUnitPriceChf().multiply(BigDecimal.valueOf(qItem.getQuantity())));
-            oItem.setPrintTimeSeconds(qItem.getPrintTimeSeconds());
-            oItem.setMaterialGrams(qItem.getMaterialGrams());
-            
-            // File Handling Check
-            // "orders/{orderId}/3d-files/{orderItemId}/{uuid}.{ext}"
-            UUID fileUuid = UUID.randomUUID();
-            String ext = getExtension(qItem.getOriginalFilename());
-            String storedFilename = fileUuid.toString() + "." + ext;
-            
-            oItem.setStoredFilename(storedFilename);
-            oItem.setStoredRelativePath("PENDING"); // Placeholder
-            oItem.setMimeType("application/octet-stream"); // specific type if known
-            
-            oItem = orderItemRepo.save(oItem);
-            
-            // Update Path now that we have ID
-            String relativePath = "orders/" + order.getId() + "/3d-files/" + oItem.getId() + "/" + storedFilename;
-            oItem.setStoredRelativePath(relativePath);
-            
-            // COPY FILE from Quote to Order
-            if (qItem.getStoredPath() != null) {
-                try {
-                    Path sourcePath = Paths.get(qItem.getStoredPath());
-                    if (Files.exists(sourcePath)) {
-                        Path targetPath = Paths.get(STORAGE_ROOT, relativePath);
-                        Files.createDirectories(targetPath.getParent());
-                        Files.copy(sourcePath, targetPath, java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-                        
-                        oItem.setFileSizeBytes(Files.size(targetPath));
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace(); // Log error but allow order creation? Or fail?
-                    // Ideally fail or mark as error
-                }
-            }
-            
-            orderItemRepo.save(oItem);
-            
-            subtotal = subtotal.add(oItem.getLineTotalChf());
-        }
-
-        // Update Order Totals
-        order.setSubtotalChf(subtotal);
-        order.setSetupCostChf(session.getSetupCostChf());
-        order.setShippingCostChf(BigDecimal.valueOf(9.00)); // Default shipping? or 0?
-        // TODO: Calc implementation for shipping
-        
-        BigDecimal total = subtotal.add(order.getSetupCostChf()).add(order.getShippingCostChf()).subtract(order.getDiscountChf() != null ? order.getDiscountChf() : BigDecimal.ZERO);
-        order.setTotalChf(total);
-        
-        // Link session
-        session.setConvertedOrderId(order.getId());
-        session.setStatus("CONVERTED"); // or CLOSED
-        quoteSessionRepo.save(session);
-        
-        return ResponseEntity.ok(orderRepo.save(order));
+        Order order = orderService.createOrderFromQuote(quoteSessionId, request);
+        List<OrderItem> items = orderItemRepo.findByOrder_Id(order.getId());
+        return ResponseEntity.ok(convertToDto(order, items));
     }
     
-    // 2. Upload file for Order Item
     @PostMapping(value = "/{orderId}/items/{orderItemId}/file", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Transactional
     public ResponseEntity<Void> uploadOrderItemFile(
@@ -224,38 +102,158 @@ public class OrderController {
             return ResponseEntity.badRequest().build();
         }
         
-        // Ensure path logic
         String relativePath = item.getStoredRelativePath();
         if (relativePath == null || relativePath.equals("PENDING")) {
-             // Should verify consistency
-             // If we used the logic above, it should have a path.
-             // If it's "PENDING", regen it.
              String ext = getExtension(file.getOriginalFilename());
              String storedFilename = UUID.randomUUID().toString() + "." + ext;
              relativePath = "orders/" + orderId + "/3d-files/" + orderItemId + "/" + storedFilename;
              item.setStoredRelativePath(relativePath);
              item.setStoredFilename(storedFilename);
-             // Update item
         }
         
-        // Save file to disk
-        Path absolutePath = Paths.get(STORAGE_ROOT, relativePath);
-        Files.createDirectories(absolutePath.getParent());
-        
-        if (Files.exists(absolutePath)) {
-            Files.delete(absolutePath); // Overwrite?
-        }
-        
-        Files.copy(file.getInputStream(), absolutePath);
-        
+        storageService.store(file, Paths.get(relativePath));
         item.setFileSizeBytes(file.getSize());
         item.setMimeType(file.getContentType());
-        // Calculate SHA256? (Optional)
-        
         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";
@@ -266,4 +264,79 @@ public class OrderController {
         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

@@ -40,6 +40,7 @@ public class QuoteSessionController {
     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";
@@ -50,13 +51,15 @@ public class QuoteSessionController {
                                   SlicerService slicerService,
                                   QuoteCalculator quoteCalculator,
                                   PrinterMachineRepository machineRepo,
-                                  com.printcalculator.repository.PricingPolicyRepository pricingRepo) {
+                                  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
@@ -99,6 +102,9 @@ public class QuoteSessionController {
     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();

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/entity/Order.java

@@ -138,6 +138,16 @@ public class Order {
         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;
     }
@@ -410,4 +420,4 @@ public class Order {
         this.paidAt = paidAt;
     }
 
-}
+}

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

@@ -67,6 +67,16 @@ public class OrderItem {
     @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;
     }
@@ -195,4 +205,4 @@ public class OrderItem {
         this.createdAt = createdAt;
     }
 
-}
+}

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

@@ -52,6 +52,9 @@ public class Payment {
     @Column(name = "initiated_at", nullable = false)
     private OffsetDateTime initiatedAt;
 
+    @Column(name = "reported_at")
+    private OffsetDateTime reportedAt;
+
     @Column(name = "received_at")
     private OffsetDateTime receivedAt;
 
@@ -135,6 +138,14 @@ public class Payment {
         this.initiatedAt = initiatedAt;
     }
 
+    public OffsetDateTime getReportedAt() {
+        return reportedAt;
+    }
+
+    public void setReportedAt(OffsetDateTime reportedAt) {
+        this.reportedAt = reportedAt;
+    }
+
     public OffsetDateTime getReceivedAt() {
         return receivedAt;
     }

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/OrderItemRepository.java

@@ -3,7 +3,9 @@ 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/PaymentRepository.java

@@ -3,7 +3,9 @@ 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/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/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

@@ -553,7 +553,7 @@ CREATE TABLE IF NOT EXISTS payments
     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', 'RECEIVED', 'FAILED', 'CANCELLED', 'REFUNDED')),
+    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),
@@ -564,6 +564,7 @@ CREATE TABLE IF NOT EXISTS payments
 
     qr_payload              text, -- se vuoi salvare contenuto QR/Swiss QR bill
     initiated_at            timestamptz    NOT NULL DEFAULT now(),
+    reported_at             timestamptz,
     received_at             timestamptz
 );
 

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,20 +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}
@@ -30,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

@@ -33,6 +33,14 @@ export const routes: Routes = [
         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)

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

@@ -46,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()) {

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/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/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

@@ -144,6 +144,37 @@ export class QuoteEstimatorService {
       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);

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

@@ -1,121 +1,128 @@
 <div class="checkout-page">
-  <h2 class="section-title">Checkout</h2>
+  <div class="container hero">
+    <h1 class="section-title">{{ 'CHECKOUT.TITLE' | translate }}</h1>
+  </div>
   
-  <div class="checkout-layout">
-    
-    <!-- LEFT COLUMN: Form -->
-    <div class="checkout-form-section">
-      <!-- Error Message -->
-      <div *ngIf="error" class="error-message">
-        {{ error }}
+  <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>
 
-      <form [formGroup]="checkoutForm" (ngSubmit)="onSubmit()" *ngIf="!error">
-        
-        <!-- Contact Info Card -->
-        <div class="form-card">
-          <div class="card-header">
-            <h3>Contact Information</h3>
+      <!-- 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="card-content">
-            
-            <!-- User Type Selector -->
-            <div class="user-type-selector">
-              <div class="type-option" [class.selected]="!isCompany" (click)="setCustomerType(false)">
-                Private
-              </div>
-              <div class="type-option" [class.selected]="isCompany" (click)="setCustomerType(true)">
-                Company
-              </div>
-            </div>
-
-            <div class="form-row">
-              <app-input formControlName="email" type="email" label="Email" [required]="true" [error]="checkoutForm.get('email')?.hasError('email') ? 'Invalid email' : null"></app-input>
-              <app-input formControlName="phone" type="tel" label="Phone" [required]="true"></app-input>
-            </div>
-          </div>
-        </div>
-
-        <!-- Billing Address Card -->
-        <div class="form-card">
-          <div class="card-header">
-            <h3>Billing Address</h3>
-          </div>
-          <div class="card-content" formGroupName="billingAddress">
-            <div class="form-row">
-              <app-input formControlName="firstName" label="First Name" [required]="true"></app-input>
-              <app-input formControlName="lastName" label="Last Name" [required]="true"></app-input>
-            </div>
-            
-            <!-- Company Name (Conditional) -->
-            <app-input *ngIf="isCompany" formControlName="companyName" label="Company Name" [required]="true"></app-input>
-            
-            <app-input formControlName="addressLine1" label="Address Line 1" [required]="true"></app-input>
-            <app-input formControlName="addressLine2" label="Address Line 2 (Optional)"></app-input>
-
-            <div class="form-row three-cols">
-              <app-input formControlName="zip" label="ZIP Code" [required]="true"></app-input>
-              <app-input formControlName="city" label="City" class="city-field" [required]="true"></app-input>
-              <app-input formControlName="countryCode" label="Country" [disabled]="true" [required]="true"></app-input>
-            </div>
-          </div>
-        </div>
-
-        <!-- Shipping Option -->
-        <div class="shipping-option">
-          <label class="checkbox-container">
-            <input type="checkbox" formControlName="shippingSameAsBilling">
-            <span class="checkmark"></span>
-            Shipping address same as billing
-          </label>
-        </div>
-
-        <!-- Shipping Address Card (Conditional) -->
-        <div class="form-card" *ngIf="!checkoutForm.get('shippingSameAsBilling')?.value">
-           <div class="card-header">
-            <h3>Shipping Address</h3>
-          </div>
-          <div class="card-content" formGroupName="shippingAddress">
-             <div class="form-row">
-              <app-input formControlName="firstName" label="First Name"></app-input>
-              <app-input formControlName="lastName" label="Last Name"></app-input>
-            </div>
-            
-            <app-input formControlName="companyName" label="Company (Optional)"></app-input>
-            <app-input formControlName="addressLine1" label="Address Line 1"></app-input>
-            <app-input formControlName="zip" label="ZIP Code"></app-input>
-            
-            <div class="form-row three-cols">
-              <app-input formControlName="zip" label="ZIP Code"></app-input>
-              <app-input formControlName="city" label="City" class="city-field"></app-input>
-              <app-input formControlName="countryCode" label="Country" [disabled]="true"></app-input>
-            </div>
-          </div>
-        </div>
-
-        <div class="actions">
-          <app-button type="submit" [disabled]="checkoutForm.invalid || isSubmitting()" [fullWidth]="true">
-            {{ isSubmitting() ? 'Processing...' : 'Place Order' }}
-          </app-button>
-        </div>
-
-      </form>
-    </div>
-
-    <!-- RIGHT COLUMN: Order Summary -->
-    <div class="checkout-summary-section">
-      <div class="form-card sticky-card">
-        <div class="card-header">
-          <h3>Order Summary</h3>
-        </div>
-        
-        <div class="card-content">
+          
           <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>Qty: {{ item.quantity }}</span> 
+                   <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">
@@ -130,22 +137,25 @@
   
           <div class="summary-totals" *ngIf="quoteSession() as session">
             <div class="total-row">
-              <span>Subtotal</span>
-              <span>{{ (session.totalPrice - session.setupCostChf) | currency:'CHF' }}</span>
+              <span>{{ 'CHECKOUT.SUBTOTAL' | translate }}</span>
+              <span>{{ session.itemsTotalChf | currency:'CHF' }}</span>
             </div>
             <div class="total-row">
-              <span>Setup Fee</span>
-              <span>{{ session.setupCostChf | currency:'CHF' }}</span>
+              <span>{{ 'CHECKOUT.SETUP_FEE' | translate }}</span>
+              <span>{{ session.session.setupCostChf | currency:'CHF' }}</span>
             </div>
-            <div class="divider"></div>
-            <div class="total-row grand-total">
-              <span>Total</span>
-              <span>{{ session.totalPrice | currency:'CHF' }}</span>
+            <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>
-        </div>
+        </app-card>
       </div>
-    </div>
 
+    </div>
   </div>
 </div>

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

@@ -1,86 +1,79 @@
-.checkout-page {
-  padding: 3rem 1rem;
-  max-width: 1200px;
-  margin: 0 auto;
+.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 380px;
+  grid-template-columns: 1fr 420px;
   gap: var(--space-8);
   align-items: start;
+  margin-bottom: var(--space-12);
 
-  @media (max-width: 900px) {
+  @media (max-width: 1024px) {
     grid-template-columns: 1fr;
-    gap: var(--space-6);
+    gap: var(--space-8);
   }
 }
 
-.section-title {
-  font-size: 2rem;
-  font-weight: 700;
+.card-header-simple {
   margin-bottom: var(--space-6);
-  color: var(--color-heading);
-}
-
-.form-card {
-  margin-bottom: var(--space-6);
-  background: var(--color-bg-surface);
-  border: 1px solid var(--color-border);
-  border-radius: var(--radius-lg);
-  overflow: hidden;
-
-  .card-header {
-    padding: var(--space-4) var(--space-6);
-    border-bottom: 1px solid var(--color-border);
-    background: var(--color-bg-subtle);
-    
-    h3 {
-      font-size: 1.1rem;
-      font-weight: 600;
-      color: var(--color-heading);
-      margin: 0;
-    }
-  }
-
-  .card-content {
-    padding: 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: 1fr 2fr 1fr;
+    grid-template-columns: 1.5fr 2fr 1fr;
     gap: var(--space-4);
-  }
-
-  app-input {
-    flex: 1;
-    width: 100%;
-  }
-
-  @media (max-width: 600px) {
-    flex-direction: column;
-    &.three-cols {
+    
+    @media (max-width: 768px) {
       grid-template-columns: 1fr;
     }
   }
+
+  app-input {
+    width: 100%;
+  }
 }
 
-/* User Type Selector Styles */
+/* User Type Selector - Matching Contact Form Style */
 .user-type-selector {
   display: flex;
-  background-color: var(--color-bg-subtle);
+  background-color: var(--color-neutral-100);
   border-radius: var(--radius-md);
   padding: 4px;
-  margin-bottom: var(--space-4);
+  margin: var(--space-6) 0;
   gap: 4px;
   width: 100%;
+  max-width: 400px;
 }
 
 .type-option {
@@ -105,8 +98,20 @@
   }
 }
 
+.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 */
@@ -114,9 +119,10 @@
   display: flex;
   align-items: center;
   position: relative;
-  padding-left: 30px;
+  padding-left: 36px;
   cursor: pointer;
   font-size: 1rem;
+  font-weight: 500;
   user-select: none;
   color: var(--color-text);
 
@@ -142,10 +148,10 @@
     top: 50%;
     left: 0;
     transform: translateY(-50%);
-    height: 20px;
-    width: 20px;
-    background-color: var(--color-bg-surface);
-    border: 1px solid var(--color-border);
+    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;
 
@@ -153,12 +159,12 @@
       content: "";
       position: absolute;
       display: none;
-      left: 6px;
-      top: 2px;
+      left: 7px;
+      top: 3px;
       width: 6px;
       height: 12px;
-      border: solid white;
-      border-width: 0 2px 2px 0;
+      border: solid #000;
+      border-width: 0 2.5px 2.5px 0;
       transform: rotate(45deg);
     }
   }
@@ -168,40 +174,48 @@
   }
 }
 
-
 .checkout-summary-section {
   position: relative;
 }
 
 .sticky-card {
   position: sticky;
-  top: 0; 
-  /* Inherits styles from .form-card */
+  top: var(--space-6);
 }
 
 .summary-items {
   margin-bottom: var(--space-6);
-  max-height: 400px;
+  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-3) 0;
+  padding: var(--space-4) 0;
   border-bottom: 1px solid var(--color-border);
 
-  &:last-child {
-    border-bottom: none;
-  }
+  &:first-child { padding-top: 0; }
+  &:last-child { border-bottom: none; }
 
   .item-details {
     flex: 1;
     
     .item-name {
       display: block;
-      font-weight: 500;
+      font-weight: 600;
+      font-size: 0.95rem;
       margin-bottom: var(--space-1);
       word-break: break-all;
       color: var(--color-text);
@@ -215,8 +229,8 @@
       color: var(--color-text-muted);
       
       .color-dot {
-        width: 12px;
-        height: 12px;
+        width: 14px;
+        height: 14px;
         border-radius: 50%;
         display: inline-block;
         border: 1px solid var(--color-border);
@@ -234,59 +248,52 @@
     font-weight: 600;
     margin-left: var(--space-3);
     white-space: nowrap;
-    color: var(--color-heading);
+    color: var(--color-text);
   }
 }
 
 .summary-totals {
-  background: var(--color-bg-subtle);
+  background: var(--color-neutral-100);
   padding: var(--space-4);
   border-radius: var(--radius-md);
-  margin-top: var(--space-4);
+  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 {
-      color: var(--color-heading);
-      font-weight: 700;
-      font-size: 1.25rem;
-      margin-top: var(--space-3);
-      padding-top: var(--space-3);
-      border-top: 1px solid var(--color-border);
-      margin-bottom: 0;
-    }
   }
 
-  .divider {
-    display: none; // Handled by border-top in grand-total
+  .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-6);
-  display: flex;
-  justify-content: flex-end;
+  margin-top: var(--space-8);
   
   app-button {
     width: 100%;
-    
-    @media (min-width: 900px) {
-        width: auto;
-        min-width: 200px;
-    }
   }
 }
 
 .error-message {
-  color: var(--color-danger);
-  background: var(--color-danger-subtle);
+  color: var(--color-error);
+  background: #fef2f2;
   padding: var(--space-4);
   border-radius: var(--radius-md);
   margin-bottom: var(--space-6);
-  border: 1px solid var(--color-danger);
+  border: 1px solid #fee2e2;
+  font-weight: 500;
 }
 
+.mb-6 { margin-bottom: var(--space-6); }

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

@@ -2,9 +2,11 @@ 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',
@@ -12,8 +14,10 @@ import { AppButtonComponent } from '../../shared/components/app-button/app-butto
   imports: [
     CommonModule, 
     ReactiveFormsModule, 
+    TranslateModule,
     AppInputComponent,
-    AppButtonComponent
+    AppButtonComponent,
+    AppCardComponent
   ],
   templateUrl: './checkout.component.html',
   styleUrls: ['./checkout.component.scss']
@@ -43,6 +47,7 @@ export class CheckoutComponent implements OnInit {
         firstName: ['', Validators.required],
         lastName: ['', Validators.required],
         companyName: [''], 
+        referencePerson: [''],
         addressLine1: ['', Validators.required],
         addressLine2: [''],
         zip: ['', Validators.required],
@@ -54,6 +59,7 @@ export class CheckoutComponent implements OnInit {
         firstName: [''],
         lastName: [''],
         companyName: [''],
+        referencePerson: [''],
         addressLine1: [''],
         addressLine2: [''],
         zip: [''],
@@ -71,16 +77,27 @@ export class CheckoutComponent implements OnInit {
     const type = isCompany ? 'BUSINESS' : 'PRIVATE';
     this.checkoutForm.patchValue({ customerType: type });
     
-    // Update validators based on 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 {
@@ -147,6 +164,7 @@ export class CheckoutComponent implements OnInit {
         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,
@@ -157,6 +175,7 @@ export class CheckoutComponent implements OnInit {
         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,

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/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

@@ -1,21 +1,129 @@
-<div class="payment-container">
-  <mat-card class="payment-card">
-    <mat-card-header>
-      <mat-icon mat-card-avatar>payment</mat-icon>
-      <mat-card-title>Payment Integration</mat-card-title>
-      <mat-card-subtitle>Order #{{ orderId }}</mat-card-subtitle>
-    </mat-card-header>
-    <mat-card-content>
-      <div class="coming-soon">
-        <h3>Coming Soon</h3>
-        <p>The online payment system is currently under development.</p>
-        <p>Your order has been saved. Please contact us to arrange payment.</p>
-      </div>
-    </mat-card-content>
-    <mat-card-actions align="end">
-      <button mat-raised-button color="primary" (click)="completeOrder()">
-        Simulate Payment Completion
-      </button>
-    </mat-card-actions>
-  </mat-card>
+<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

@@ -1,35 +1,236 @@
-.payment-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 80vh;
-  padding: 2rem;
-  background-color: #f5f5f5;
-}
-
-.payment-card {
-  max-width: 500px;
-  width: 100%;
-}
-
-.coming-soon {
+.hero {
+  padding: var(--space-12) 0 var(--space-8);
   text-align: center;
-  padding: 2rem 0;
-  
-  h3 {
-    margin-bottom: 1rem;
-    color: #555;
-  }
-  
-  p {
-    color: #777;
-    margin-bottom: 0.5rem;
+
+  h1 {
+    font-size: 2.5rem;
+    margin-bottom: var(--space-2);
   }
 }
 
-mat-icon {
-  font-size: 40px;
-  width: 40px;
-  height: 40px;
-  color: #3f51b5;
+.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

@@ -1,34 +1,150 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject, signal } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatIconModule } from '@angular/material/icon';
+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, MatButtonModule, MatCardModule, MatIconModule],
+  imports: [CommonModule, AppButtonComponent, AppCardComponent, TranslateModule],
   templateUrl: './payment.component.html',
   styleUrl: './payment.component.scss'
 })
 export class PaymentComponent implements OnInit {
-  orderId: string | null = null;
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private quoteService = inject(QuoteEstimatorService);
 
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router
-  ) {}
+  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 {
-    // Simulate payment completion
-    alert('Payment Simulated! Order marked as PAID.');
-    // Here you would call the backend to mark as paid if we had that endpoint ready
-    // For now, redirect home or show success
-    this.router.navigate(['/']);
+    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/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"
   }
 }

frontend/src/assets/i18n/it.json

@@ -11,6 +11,52 @@
     "TERMS": "Termini & Condizioni",
     "CONTACT": "Contattaci"
   },
+  "HOME": {
+    "HERO_EYEBROW": "Stampa 3D tecnica per aziende, freelance e maker",
+    "HERO_TITLE": "Prezzo e tempi in pochi secondi.<br>Dal file 3D al pezzo finito.",
+    "HERO_LEAD": "Il calcolatore più avanzato per le tue stampe 3D: precisione assoluta e zero sorprese.",
+    "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.",
+    "BTN_CALCULATE": "Calcola Preventivo",
+    "BTN_SHOP": "Vai allo shop",
+    "BTN_CONTACT": "Parla con noi",
+    "SEC_CALC_TITLE": "Preventivo immediato in pochi secondi",
+    "SEC_CALC_SUBTITLE": "Nessuna registrazione necessaria. Non salviamo il tuo file fino al momento dell'ordine e la stima è effettuata tramite vero slicing.",
+    "SEC_CALC_LIST_1": "Formati supportati: STL, 3MF, STEP, OBJ",
+    "SEC_CALC_LIST_2": "Qualità: bozza, standard, alta definizione",
+    "CARD_CALC_EYEBROW": "Calcolo automatico",
+    "CARD_CALC_TITLE": "Prezzo e tempi in un click",
+    "CARD_CALC_TAG": "Senza registrazione",
+    "CARD_CALC_STEP_1": "Carica il file 3D",
+    "CARD_CALC_STEP_2": "Scegli materiale e qualità",
+    "CARD_CALC_STEP_3": "Ricevi subito costo e tempo",
+    "BTN_OPEN_CALC": "Apri calcolatore",
+    "SEC_CAP_TITLE": "Cosa puoi ottenere",
+    "SEC_CAP_SUBTITLE": "Produzione su misura per prototipi, piccole serie e pezzi personalizzati.",
+    "CAP_1_TITLE": "Prototipazione veloce",
+    "CAP_1_TEXT": "Dal file digitale al modello fisico in 24/48 ore. Verifica ergonomia, incastri e funzionamento prima dello stampo definitivo.",
+    "CAP_2_TITLE": "Pezzi personalizzati",
+    "CAP_2_TEXT": "Componenti unici impossibili da trovare in commercio. Riproduciamo parti rotte o creiamo adattamenti su misura.",
+    "CAP_3_TITLE": "Piccole serie",
+    "CAP_3_TEXT": "Produzione ponte o serie limitate (10-500 pezzi) con qualità ripetibile. Ideale per validazione di mercato.",
+    "CAP_4_TITLE": "Consulenza e CAD",
+    "CAP_4_TEXT": "Non hai il file 3D? Ti aiutiamo a progettarlo, ottimizzarlo per la stampa e scegliere il materiale giusto.",
+    "SEC_SHOP_TITLE": "Shop di soluzioni tecniche pronte",
+    "SEC_SHOP_TEXT": "Prodotti selezionati, testati in laboratorio e pronti all'uso. Risolvono problemi reali con funzionalità concrete.",
+    "SEC_SHOP_LIST_1": "Accessori funzionali per officine e laboratori",
+    "SEC_SHOP_LIST_2": "Ricambi e componenti difficili da reperire",
+    "SEC_SHOP_LIST_3": "Supporti e organizzatori per migliorare i flussi di lavoro",
+    "BTN_DISCOVER": "Scopri i prodotti",
+    "BTN_REQ_SOLUTION": "Richiedi una soluzione",
+    "CARD_SHOP_1_TITLE": "Best seller tecnici",
+    "CARD_SHOP_1_TEXT": "Soluzioni provate sul campo e già pronte alla spedizione.",
+    "CARD_SHOP_2_TITLE": "Kit pronti all'uso",
+    "CARD_SHOP_2_TEXT": "Componenti compatibili e facili da montare senza sorprese.",
+    "CARD_SHOP_3_TITLE": "Su richiesta",
+    "CARD_SHOP_3_TEXT": "Non trovi quello che serve? Lo progettiamo e lo produciamo per te.",
+    "SEC_ABOUT_TITLE": "Su di noi",
+    "SEC_ABOUT_TEXT": "3D fab è un laboratorio tecnico di stampa 3D. Seguiamo progetti dalla consulenza iniziale alla produzione, con tempi chiari e supporto diretto.",
+    "FOUNDERS_PHOTO": "Foto Founders"
+  },
   "CALC": {
     "TITLE": "Calcola Preventivo 3D",
     "SUBTITLE": "Carica il tuo file 3D (STL, 3MF, STEP...) e ricevi una stima immediata di costi e tempi di stampa.",
@@ -47,13 +93,53 @@
     "BENEFITS_1": "Preventivo automatico con costo e tempo immediati",
     "BENEFITS_2": "Materiali selezionati e qualità controllata",
     "BENEFITS_3": "Consulenza CAD se il file ha bisogno di modifiche",
-    "ERR_FILE_REQUIRED": "Il file è obbligatorio."
+    "ERR_FILE_REQUIRED": "Il file è obbligatorio.",
+    "ANALYZING_TITLE": "Analisi in corso...",
+    "ANALYZING_TEXT": "Stiamo analizzando la geometria e calcolando il percorso utensile.",
+    "QTY_SHORT": "QTÀ",
+    "COLOR_LABEL": "COLORE",
+    "ADD_FILES": "Aggiungi file",
+    "UPLOADING": "Caricamento...",
+    "PROCESSING": "Elaborazione...",
+    "NOTES_PLACEHOLDER": "Istruzioni specifiche...",
+    "SETUP_NOTE": "* Include {{cost}} Costo di Setup"
+  },
+  "QUOTE": {
+    "PROCEED_ORDER": "Procedi con l'ordine",
+    "CONSULT": "Richiedi Consulenza",
+    "TOTAL": "Totale"
+  },
+  "USER_DETAILS": {
+    "TITLE": "I tuoi dati",
+    "NAME": "Nome",
+    "NAME_PLACEHOLDER": "Il tuo nome",
+    "SURNAME": "Cognome",
+    "SURNAME_PLACEHOLDER": "Il tuo cognome",
+    "EMAIL": "Email",
+    "EMAIL_PLACEHOLDER": "tua@email.com",
+    "PHONE": "Telefono",
+    "PHONE_PLACEHOLDER": "+41 ...",
+    "ADDRESS": "Indirizzo",
+    "ADDRESS_PLACEHOLDER": "Via e numero",
+    "ZIP": "CAP",
+    "ZIP_PLACEHOLDER": "0000",
+    "CITY": "Città",
+    "CITY_PLACEHOLDER": "Città",
+    "SUBMIT": "Procedi",
+    "SUMMARY_TITLE": "Riepilogo"
+  },
+  "COMMON": {
+    "REQUIRED": "Campo obbligatorio",
+    "INVALID_EMAIL": "Email non valida",
+    "BACK": "Indietro",
+    "OPTIONAL": "(Opzionale)"
   },
   "SHOP": {
     "TITLE": "Soluzioni tecniche",
     "SUBTITLE": "Prodotti pronti che risolvono problemi pratici",
     "ADD_CART": "Aggiungi al Carrello",
-    "BACK": "Torna allo Shop"
+    "BACK": "Torna allo Shop",
+    "NOT_FOUND": "Prodotto non trovato."
   },
   "ABOUT": {
     "TITLE": "Chi Siamo",
@@ -126,6 +212,80 @@
     "ERR_MAX_FILES": "Limite massimo di 15 file raggiunto.",
     "SUCCESS_TITLE": "Messaggio Inviato con Successo",
     "SUCCESS_DESC": "Grazie per averci contattato. Abbiamo ricevuto il tuo messaggio e ti invieremo una email di riepilogo a breve.",
-    "SEND_ANOTHER": "Invia un altro messaggio"
+    "SEND_ANOTHER": "Invia un altro messaggio",
+    "HERO_SUBTITLE": "Siamo qui per aiutarti. Compila il modulo sottostante per qualsiasi richiesta.",
+    "FILE_TYPE_PDF": "PDF",
+    "FILE_TYPE_3D": "3D"
+  },
+  "CHECKOUT": {
+    "TITLE": "Checkout",
+    "SUBTITLE": "Completa il tuo ordine inserendo i dettagli per la spedizione e il pagamento.",
+    "CONTACT_INFO": "Informazioni di Contatto",
+    "BILLING_ADDR": "Indirizzo di Fatturazione",
+    "SHIPPING_ADDR": "Indirizzo di Spedizione",
+    "FIRST_NAME": "Nome",
+    "LAST_NAME": "Cognome",
+    "EMAIL": "Email",
+    "PHONE": "Telefono",
+    "COMPANY_NAME": "Nome Azienda",
+    "ADDRESS_1": "Indirizzo (Via e numero)",
+    "ADDRESS_2": "Informazioni aggiuntive (opzionale)",
+    "ZIP": "CAP",
+    "CITY": "Città",
+    "COUNTRY": "Paese",
+    "SHIPPING_SAME": "L'indirizzo di spedizione è lo stesso di quello di fatturazione",
+    "PLACE_ORDER": "Invia Ordine",
+    "PROCESSING": "Elaborazione...",
+    "SUMMARY_TITLE": "Riepilogo Ordine",
+    "SUBTOTAL": "Subtotale",
+    "SETUP_FEE": "Costo di Avvio",
+    "TOTAL": "Totale",
+    "QTY": "Qtà",
+    "SHIPPING": "Spedizione",
+    "INVALID_EMAIL": "Email non valida",
+    "COMPANY_OPTIONAL": "Nome Azienda (Opzionale)",
+    "REF_PERSON_OPTIONAL": "Persona di Riferimento (Opzionale)"
+  },
+  "PAYMENT": {
+    "TITLE": "Pagamento",
+    "METHOD": "Metodo di Pagamento",
+    "TWINT_TITLE": "Paga con TWINT",
+    "TWINT_DESC": "Inquadra il codice con l'app TWINT",
+    "TWINT_OPEN": "Apri direttamente in TWINT",
+    "TWINT_LINK": "Apri link di pagamento",
+    "BANK_TITLE": "Bonifico Bancario",
+    "BANK_OWNER": "Titolare",
+    "BANK_IBAN": "IBAN",
+    "BANK_REF": "Riferimento",
+    "BILLING_INFO_HINT": "Aggiungi le informazioni uguali a quelle della fatturazione.",
+    "DOWNLOAD_QR": "Scarica QR-Fattura (PDF)",
+    "CONFIRM": "Conferma Ordine",
+    "SUMMARY_TITLE": "Riepilogo Ordine",
+    "SUBTOTAL": "Subtotale",
+    "SHIPPING": "Spedizione",
+    "SETUP_FEE": "Costo Setup",
+    "TOTAL": "Totale",
+    "LOADING": "Caricamento dettagli ordine...",
+    "METHOD_TWINT": "TWINT",
+    "METHOD_BANK": "Fattura QR / Bonifico",
+    "STATUS_REPORTED_TITLE": "Abbiamo ricevuto la tua segnalazione",
+    "STATUS_REPORTED_DESC": "Stiamo verificando la transazione. Il tuo ordine passerà in produzione non appena l'accredito sarà confermato.",
+    "IN_VERIFICATION": "Pagamento in verifica"
+  },
+  "TRACKING": {
+    "STEP_PENDING": "In attesa",
+    "STEP_REPORTED": "In verifica",
+    "STEP_PRODUCTION": "In Produzione",
+    "STEP_SHIPPED": "Spedito"
+  },
+  "ORDER_CONFIRMED": {
+    "TITLE": "Ordine Confermato",
+    "SUBTITLE": "Pagamento registrato. Il tuo ordine è ora in elaborazione.",
+    "STATUS": "In elaborazione",
+    "HEADING": "Stiamo preparando il tuo ordine",
+    "ORDER_REF": "Riferimento ordine",
+    "PROCESSING_TEXT": "Non appena confermiamo il pagamento, il tuo ordine passerà in produzione.",
+    "EMAIL_TEXT": "Ti invieremo una email con aggiornamento stato e prossimi step.",
+    "BACK_HOME": "Torna alla Home"
   }
 }