@softwear/latestcollectioncore 1.0.188 → 1.0.190

package/dist/reports.d.ts

@@ -23,6 +23,12 @@ export interface PdfImageAsset {
 export interface GenPdfOptions {
     onAlert?: (alert: GenPdfAlert) => void;
     translate?: (key: string) => string;
+    /**
+     * Called for layout fields with `format: 'currency'`. Receives the raw string from `source` (e.g. `"123.45"`).
+     * Return the exact string to draw. Callers normally pass a closure created next to `genPDF` so it can read
+     * `printBuffer`, tenant currency, locale, etc. If omitted, defaults to a euro prefix plus two decimals (`€ 123.45`).
+     */
+    formatCurrency?: (rawAmountString: string) => string;
     resolveLogoUrl?: () => string | undefined;
     isCustomPdfFont?: (fontFamily: string) => boolean;
     getPdfFontDefinition?: (fontFamily: string) => PdfFontDefinition | undefined;

package/dist/reports.js

@@ -299,8 +299,10 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
             (_a = options.onAlert) === null || _a === void 0 ? void 0 : _a.call(options, { header: 'fieldnotfound', body: object.source, type: 'warning', timeout: 10000 });
             text = '';
         }
-        if (object.format == 'currency')
-            text = String.fromCharCode(128) + ' ' + parseFloat(text).toFixed(2);
+        if (object.format == 'currency') {
+            const raw = text;
+            text = options.formatCurrency ? options.formatCurrency(raw) : '€ ' + parseFloat(raw).toFixed(2);
+        }
     }
     // Manipulate case as specified in object
     if ((object.type === 'text' || object.type === 'field') && object.case === 1)
@@ -508,11 +510,7 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
     const layoutYtenths = originY + object.y;
     const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset !== null && printOnlyAtStartContainersOffset !== void 0 ? printOnlyAtStartContainersOffset : 0;
     /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
-    const effectivePrintOnlyAtStartContainersOffsetNow = () => containerChain.length === 0 &&
-        rawPrintOnlyAtStartOffset > 0 &&
-        getCurrentPageNumber(doc, context) === 1
-        ? rawPrintOnlyAtStartOffset
-        : 0;
+    const effectivePrintOnlyAtStartContainersOffsetNow = () => (containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0);
     const x = layoutXtenths / 10;
     const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10;
     const width = object.width / 10;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.188",
+  "version": "1.0.190",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/reports.ts

@@ -32,6 +32,12 @@ export interface PdfImageAsset {
 export interface GenPdfOptions {
   onAlert?: (alert: GenPdfAlert) => void
   translate?: (key: string) => string
+  /**
+   * Called for layout fields with `format: 'currency'`. Receives the raw string from `source` (e.g. `"123.45"`).
+   * Return the exact string to draw. Callers normally pass a closure created next to `genPDF` so it can read
+   * `printBuffer`, tenant currency, locale, etc. If omitted, defaults to a euro prefix plus two decimals (`€ 123.45`).
+   */
+  formatCurrency?: (rawAmountString: string) => string
   resolveLogoUrl?: () => string | undefined
   isCustomPdfFont?: (fontFamily: string) => boolean
   getPdfFontDefinition?: (fontFamily: string) => PdfFontDefinition | undefined
@@ -353,7 +359,10 @@ function drawSimpleObject(x: number, y: number, doc: jsPDF, object: LayoutObject
       options.onAlert?.({ header: 'fieldnotfound', body: object.source, type: 'warning', timeout: 10000 })
       text = ''
     }
-    if (object.format == 'currency') text = String.fromCharCode(128) + ' ' + parseFloat(text).toFixed(2)
+    if (object.format == 'currency') {
+      const raw = text
+      text = options.formatCurrency ? options.formatCurrency(raw) : '€ ' + parseFloat(raw).toFixed(2)
+    }
   }
   // Manipulate case as specified in object
   if ((object.type === 'text' || object.type === 'field') && object.case === 1) text = text.toUpperCase()
@@ -586,12 +595,7 @@ addObjectToPDF = function (
   const layoutYtenths = originY + object.y
   const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset ?? 0
   /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
-  const effectivePrintOnlyAtStartContainersOffsetNow = (): number =>
-    containerChain.length === 0 &&
-    rawPrintOnlyAtStartOffset > 0 &&
-    getCurrentPageNumber(doc, context) === 1
-      ? rawPrintOnlyAtStartOffset
-      : 0
+  const effectivePrintOnlyAtStartContainersOffsetNow = (): number => (containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0)
 
   const x = layoutXtenths / 10
   const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10

package/test/reports.spec.ts

@@ -331,4 +331,62 @@ describe('genPDF', () => {
     expect(chromeMatches?.length ?? 0).toBeGreaterThanOrEqual(doc.getNumberOfPages())
     expect(pdfText).toContain('SKU_20')
   })
+
+  it('uses GenPdfOptions.formatCurrency for currency fields when provided', async () => {
+    const layout: Layout = {
+      name: 'currency-inject',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'field' as const,
+          name: 'amount',
+          x: 20,
+          y: 20,
+          width: 500,
+          height: 50,
+          active: true,
+          source: 'amount',
+          format: 'currency' as const,
+          textAlign: 1 as const,
+          fontFamily: 'Helvetica',
+          fontSize: 32,
+          fontStyle: 0,
+        },
+      ],
+    }
+    const printBuffer = { amount: '99.5', currency: 'USD' }
+    const doc = await genPDF(layout, printBuffer, {
+      formatCurrency: (raw) => `USD ${raw} BUF:${printBuffer.currency}`,
+    })
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    expect(pdfText).toContain('USD 99.5 BUF:USD')
+  })
+
+  it('defaults currency fields to euro-style prefix when formatCurrency is omitted', async () => {
+    const layout: Layout = {
+      name: 'currency-default',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'field' as const,
+          name: 'amount',
+          x: 20,
+          y: 20,
+          width: 500,
+          height: 50,
+          active: true,
+          source: 'amount',
+          format: 'currency' as const,
+          textAlign: 1 as const,
+          fontFamily: 'Helvetica',
+          fontSize: 32,
+          fontStyle: 0,
+        },
+      ],
+    }
+    const doc = await genPDF(layout, { amount: '10' })
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    // jsPDF encodes U+20AC as WinAnsi 0x80 in the text operator; still one glyph before digits.
+    expect(pdfText).toMatch(/\(\s*.\s*10\.00\) Tj/)
+  })
 })