@softwear/latestcollectioncore 1.0.189 → 1.0.191

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/dist/transaction.js

@@ -267,8 +267,8 @@ const buildTransaction = function (transaction) {
         dbTransaction.sellprice = transaction.sellprice;
     if (transaction.vat !== undefined)
         dbTransaction.vat = transaction.vat;
-    if (transaction.customer)
-        dbTransaction.customer = transaction.customer;
+    if (transaction.custnr)
+        dbTransaction.custnr = transaction.custnr;
     if (transaction.agent)
         dbTransaction.agent = transaction.agent;
     // if (transaction.type == transactionTypeE.START_SHELF_STOCK) dbTransaction.type = transactionTypeE.START_STOCK

package/dist/types.d.ts

@@ -265,7 +265,7 @@ interface dbTransactionI {
     ean: string;
     wh: string;
     agent?: string;
-    customer?: string;
+    custnr?: string;
     docnr: string;
     time: number;
     vector?: number[];
@@ -281,7 +281,7 @@ interface TransactionI {
     ean: string;
     wh: string;
     agent?: string;
-    customer?: string;
+    custnr?: string;
     docnr: string;
     time: number;
     qty: number;

package/package.json

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

package/src/transaction.ts

@@ -282,7 +282,7 @@ const buildTransaction = function (transaction: TransactionI): dbTransactionI |
   if (transaction.buyprice !== undefined) dbTransaction.buyprice = transaction.buyprice
   if (transaction.sellprice !== undefined) dbTransaction.sellprice = transaction.sellprice
   if (transaction.vat !== undefined) dbTransaction.vat = transaction.vat
-  if (transaction.customer) dbTransaction.customer = transaction.customer
+  if (transaction.custnr) dbTransaction.custnr = transaction.custnr
   if (transaction.agent) dbTransaction.agent = transaction.agent
   // if (transaction.type == transactionTypeE.START_SHELF_STOCK) dbTransaction.type = transactionTypeE.START_STOCK
 

package/src/types.ts

@@ -282,7 +282,7 @@ interface dbTransactionI {
   ean: string
   wh: string
   agent?: string
-  customer?: string
+  custnr?: string
   docnr: string
   time: number
   vector?: number[]
@@ -298,7 +298,7 @@ interface TransactionI {
   ean: string
   wh: string
   agent?: string
-  customer?: string
+  custnr?: string
   docnr: string
   time: number
   qty: number

package/test/transaction.spec.js

@@ -23,7 +23,7 @@ describe('#Transactions', () => {
         wh: '51',
         time: 314159265,
         qty: 123,
-        customer: '123',
+        custnr: '123',
         agent: '01',
         sellprice: 19.95,
         buyprice: 9.95,
@@ -40,7 +40,7 @@ describe('#Transactions', () => {
         buyprice: 9.95,
         sellprice: 19.95,
         vat: 21,
-        customer: '123',
+        custnr: '123',
         agent: '01',
         docnr: '51-123',
       })