JoeKung/print-calculator
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(back-end): fix test gcode parser
All checks were successful
Build, Test and Deploy / test-backend (push) Successful in 1m22s
Details
Build, Test and Deploy / build-and-push (push) Successful in 33s
Details
Build, Test and Deploy / deploy (push) Successful in 7s
Details

Browse Source
This commit is contained in:
Joe Küng
2026-02-14 19:10:02 +01:00
parent 475bfcc6fb
commit 165e12f216
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/com/printcalculator/controller/OrderController.java
View File

@@ -168,7 +168,16 @@ public class OrderController {
vars.put("grandTotalFormatted", String.format("CHF %.2f", order.getTotalChf())); vars.put("grandTotalFormatted", String.format("CHF %.2f", order.getTotalChf()));
vars.put("paymentTermsText", "Pagamento entro 7 giorni via Bonifico o TWINT. Grazie."); vars.put("paymentTermsText", "Pagamento entro 7 giorni via Bonifico o TWINT. Grazie.");
String qrBillSvg = new String(qrBillService.generateQrBillSvg(order)); 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); byte[] pdf = invoiceService.generateInvoicePdfBytesFromTemplate(vars, qrBillSvg);
return ResponseEntity.ok() return ResponseEntity.ok()

8
backend/src/main/java/com/printcalculator/service/OrderService.java
View File

@@ -203,6 +203,14 @@ public class OrderService {
// 1. Generate QR Bill // 1. Generate QR Bill
byte[] qrBillSvgBytes = qrBillService.generateQrBillSvg(order); byte[] qrBillSvgBytes = qrBillService.generateQrBillSvg(order);
String qrBillSvg = new String(qrBillSvgBytes, StandardCharsets.UTF_8); 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 // Save QR Bill SVG
String qrRelativePath = "orders/" + order.getId() + "/documents/qr-bill.svg"; String qrRelativePath = "orders/" + order.getId() + "/documents/qr-bill.svg";

2
backend/src/main/resources/templates/invoice.html
View File

@@ -1,4 +1,4 @@
<!doctype html> <!DOCTYPE html>
<html lang="it" xmlns:th="http://www.thymeleaf.org"> <html lang="it" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>