Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42a0d2d8b1 |
@@ -167,6 +167,8 @@ async function generateFromDirectus(req, res, next) {
|
|||||||
previewSession: order.preview_session || null,
|
previewSession: order.preview_session || null,
|
||||||
// Eingegebener Brieftext → als brieftext.txt im Ausgabeordner ablegen.
|
// Eingegebener Brieftext → als brieftext.txt im Ausgabeordner ablegen.
|
||||||
rawText: order.text_template || null,
|
rawText: order.text_template || null,
|
||||||
|
// Absender fürs Kuvert (manuelle Aufträge): oben links, Empfänger unten rechts.
|
||||||
|
envelopeSender: order.envelope_sender || null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -311,8 +311,9 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
const filepath = isEnv ? path.join(envelopesDir, filename) : path.join(outputDir, filename);
|
const filepath = isEnv ? path.join(envelopesDir, filename) : path.join(outputDir, filename);
|
||||||
|
|
||||||
// 1:1 aus der Vorschau übernehmen, wenn für dieses Dokument eine
|
// 1:1 aus der Vorschau übernehmen, wenn für dieses Dokument eine
|
||||||
// Vorschau-Datei existiert.
|
// Vorschau-Datei existiert. Ausnahme: Kuvert mit Absender – das wird frisch
|
||||||
if (previewSession) {
|
// gerendert, damit der Absender (oben links) sicher drauf ist.
|
||||||
|
if (previewSession && !(isEnv && metadata.envelopeSender)) {
|
||||||
const cached = path.join(previewsRoot, previewSession, filename);
|
const cached = path.join(previewsRoot, previewSession, filename);
|
||||||
try {
|
try {
|
||||||
await fs.access(cached);
|
await fs.access(cached);
|
||||||
@@ -329,7 +330,7 @@ async function runGeneration({ orderNumber, letters, metadata }) {
|
|||||||
if (isEnv) {
|
if (isEnv) {
|
||||||
svgResult = generateEnvelopeSVG(
|
svgResult = generateEnvelopeSVG(
|
||||||
scriptalizedText, letter.format, letter.envelopeType,
|
scriptalizedText, letter.format, letter.envelopeType,
|
||||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale }
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: metadata.envelopeSender || '' }
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
svgResult = generateLetterSVG(
|
svgResult = generateLetterSVG(
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ async function generateBatch(req, res, next) {
|
|||||||
if (letter.type === "envelope") {
|
if (letter.type === "envelope") {
|
||||||
const svgResult = generateEnvelopeSVG(
|
const svgResult = generateEnvelopeSVG(
|
||||||
scriptalizedText, letter.format, letter.envelopeType,
|
scriptalizedText, letter.format, letter.envelopeType,
|
||||||
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale }
|
{ font: letter.font, realisticHandwriting: letter.realisticHandwriting ?? false, fontScale: letter.fontScale, sender: letter.sender || '' }
|
||||||
);
|
);
|
||||||
if (svgResult.overflow) hasOverflow = true;
|
if (svgResult.overflow) hasOverflow = true;
|
||||||
const filename = `envelope_${pad}.svg`;
|
const filename = `envelope_${pad}.svg`;
|
||||||
|
|||||||
@@ -294,8 +294,10 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
startX = 0; // Dummy-Wert, wird für jede Zeile überschrieben
|
startX = 0; // Dummy-Wert, wird für jede Zeile überschrieben
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// type === 'recipient' / 'free': Links, max. 60% der Umschlagsbreite
|
// type === 'recipient' / 'free'. Ist ein Absender gesetzt, sitzt der
|
||||||
const maxWidthPx = Math.min(widthPx - marginLeftPx - 20, widthPx * 0.6);
|
// Empfänger UNTEN RECHTS (klassisches Kuvert), sonst wie bisher oben links.
|
||||||
|
const hatAbsender = !!String(options.sender || '').trim();
|
||||||
|
const maxWidthPx = Math.min(widthPx - marginLeftPx - 20, widthPx * (hatAbsender ? 0.48 : 0.6));
|
||||||
|
|
||||||
lines = wrapTextToLinesByWidth({
|
lines = wrapTextToLinesByWidth({
|
||||||
text: String(text || ''),
|
text: String(text || ''),
|
||||||
@@ -304,8 +306,13 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
fontSizePx,
|
fontSizePx,
|
||||||
});
|
});
|
||||||
|
|
||||||
startX = marginLeftPx;
|
if (hatAbsender) {
|
||||||
startY = marginTopPx + fontSizePx;
|
startX = Math.max(marginLeftPx, Math.round(widthPx * 0.48));
|
||||||
|
startY = Math.max(marginTopPx + fontSizePx, heightPx - marginTopPx - lines.length * lineHeightPx + fontSizePx);
|
||||||
|
} else {
|
||||||
|
startX = marginLeftPx;
|
||||||
|
startY = marginTopPx + fontSizePx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let paths = [];
|
let paths = [];
|
||||||
@@ -347,6 +354,24 @@ function generateEnvelopeSVG(text, format, type, options = {}) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Absender oben links (kleiner) – nur wenn gesetzt und kein zentrierter Freitext.
|
||||||
|
const absender = String(options.sender || '').trim();
|
||||||
|
if (absender && type !== 'custom') {
|
||||||
|
const absSize = fontSizePx * 0.62;
|
||||||
|
const absLH = lineHeightPx * 0.62;
|
||||||
|
const absLines = absender.split('\n').map((l) => l.replace(/\s+$/, ''));
|
||||||
|
const absPaths = layoutTextToPaths({
|
||||||
|
lines: absLines,
|
||||||
|
fontFileName: fontConfig.file,
|
||||||
|
fontSizePx: absSize,
|
||||||
|
startX: marginLeftPx,
|
||||||
|
startY: marginTopPx + absSize,
|
||||||
|
lineHeightPx: absLH,
|
||||||
|
realisticHandwriting: options.realisticHandwriting ?? false,
|
||||||
|
});
|
||||||
|
paths = [...paths, ...absPaths];
|
||||||
|
}
|
||||||
|
|
||||||
const pathElements = paths
|
const pathElements = paths
|
||||||
.map(
|
.map(
|
||||||
(p) => `<path d="${escapeXml(p.d)}"
|
(p) => `<path d="${escapeXml(p.d)}"
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ async function directusFetch(path, options = {}) {
|
|||||||
async function fetchOrder(orderId) {
|
async function fetchOrder(orderId) {
|
||||||
const fields = [
|
const fields = [
|
||||||
'id', 'order_number', 'customer_email', 'font', 'status',
|
'id', 'order_number', 'customer_email', 'font', 'status',
|
||||||
'needs_envelope', 'envelope_labeling', 'envelope_text', 'envelope_format',
|
'needs_envelope', 'envelope_labeling', 'envelope_text', 'envelope_format', 'envelope_sender',
|
||||||
'text_template', 'motif_mode', 'own_cards', 'entries_count', 'preview_session',
|
'text_template', 'motif_mode', 'own_cards', 'entries_count', 'preview_session',
|
||||||
'source_file', 'product.key', 'product.type', 'product.input_mode', 'format.key',
|
'source_file', 'product.key', 'product.type', 'product.input_mode', 'format.key',
|
||||||
'font_scale_letter', 'font_scale_envelope', 'signatures_manual', 'multi_page', 'realistic',
|
'font_scale_letter', 'font_scale_envelope', 'signatures_manual', 'multi_page', 'realistic',
|
||||||
|
|||||||
Reference in New Issue
Block a user