feat(back-end): shop ui implementation
All checks were successful
PR Checks / prettier-autofix (pull_request) Successful in 19s
PR Checks / security-sast (pull_request) Successful in 34s
PR Checks / test-backend (pull_request) Successful in 29s
PR Checks / test-frontend (pull_request) Successful in 59s

This commit is contained in:
2026-03-10 08:31:29 +01:00
parent cd0c13203f
commit a212a1d8cc
32 changed files with 4233 additions and 396 deletions

View File

@@ -191,7 +191,9 @@ public class OrderService {
oItem.setShopVariantLabel(qItem.getShopVariantLabel());
oItem.setShopVariantColorName(qItem.getShopVariantColorName());
oItem.setShopVariantColorHex(qItem.getShopVariantColorHex());
if (qItem.getFilamentVariant() != null
if (qItem.getMaterialCode() != null && !qItem.getMaterialCode().isBlank()) {
oItem.setMaterialCode(qItem.getMaterialCode());
} else if (qItem.getFilamentVariant() != null
&& qItem.getFilamentVariant().getFilamentMaterialType() != null
&& qItem.getFilamentVariant().getFilamentMaterialType().getMaterialCode() != null) {
oItem.setMaterialCode(qItem.getFilamentVariant().getFilamentMaterialType().getMaterialCode());

View File

@@ -88,14 +88,9 @@ public class InvoicePdfRenderingService {
vars.put("shippingAddressLine2", order.getShippingZip() + " " + order.getShippingCity() + ", " + order.getShippingCountryCode());
}
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());
List<Map<String, Object>> invoiceLineItems = items.stream()
.map(this::toInvoiceLineItem)
.collect(Collectors.toList());
if (order.getCadTotalChf() != null && order.getCadTotalChf().compareTo(BigDecimal.ZERO) > 0) {
BigDecimal cadHours = order.getCadHours() != null ? order.getCadHours() : BigDecimal.ZERO;
@@ -157,4 +152,45 @@ public class InvoicePdfRenderingService {
private String formatCadHours(BigDecimal hours) {
return hours.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
}
private Map<String, Object> toInvoiceLineItem(OrderItem item) {
Map<String, Object> line = new HashMap<>();
line.put("description", buildLineDescription(item));
line.put("quantity", item.getQuantity());
line.put("unitPriceFormatted", String.format("CHF %.2f", item.getUnitPriceChf()));
line.put("lineTotalFormatted", String.format("CHF %.2f", item.getLineTotalChf()));
return line;
}
private String buildLineDescription(OrderItem item) {
if (item == null) {
return "Articolo";
}
if ("SHOP_PRODUCT".equalsIgnoreCase(item.getItemType())) {
String productName = firstNonBlank(
item.getDisplayName(),
item.getShopProductName(),
item.getOriginalFilename(),
"Prodotto shop"
);
String variantLabel = firstNonBlank(item.getShopVariantLabel(), item.getShopVariantColorName(), null);
return variantLabel != null ? productName + " - " + variantLabel : productName;
}
String fileName = firstNonBlank(item.getDisplayName(), item.getOriginalFilename(), "File 3D");
return "Stampa 3D: " + fileName;
}
private String firstNonBlank(String... values) {
if (values == null || values.length == 0) {
return null;
}
for (String value : values) {
if (value != null && !value.isBlank()) {
return value;
}
}
return null;
}
}