shareneus 1.6.98 → 1.7.0

package/dist/shared/table-section/pdf-table.row.js

@@ -51,6 +51,7 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
 }
 function formatFieldValue(item, fieldConfig, fixedTo) {
     const rawValue = getFirstFieldValue(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields);
+    console.log('rawValue for fieldConfig', fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields, 'is', rawValue);
     if (isExpiryField(fieldConfig)) {
         return formatExpiryDateValue(rawValue);
     }
@@ -94,8 +95,7 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
-    const fields = Array.isArray(dbFields) ? dbFields : [dbFields];
-    for (const field of fields) {
+    for (const field of dbFields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {
             return String(value);
@@ -104,23 +104,36 @@ function getFirstFieldValue(item, dbFields = []) {
     return '';
 }
 function readValue(item, field) {
-    const normalizedField = normalizeDbFieldPath(field);
-    if (!item || !normalizedField) {
+    if (!item || !field) {
         return undefined;
     }
-    if (item[normalizedField] !== undefined) {
-        return item[normalizedField];
+    if (item[field] !== undefined) {
+        return item[field];
     }
-    const dottedPathValue = normalizedField.split('.').reduce((current, key) => {
+    const pathSegments = field.split('.');
+    const dottedPathValue = pathSegments.reduce((current, key) => {
+        console.log('Current value for key', key, 'is', current);
         if (current && current[key] !== undefined) {
             return current[key];
         }
         return undefined;
     }, item);
+    console.log('Value for field', field, 'is', dottedPathValue);
     if (dottedPathValue !== undefined) {
         return dottedPathValue;
     }
-    return deepFindByKey(item, normalizedField);
+    if (pathSegments.length > 1) {
+        const rootValue = item[pathSegments[0]];
+        if (rootValue !== undefined && rootValue !== null && typeof rootValue !== 'object') {
+            return rootValue;
+        }
+        const leafField = pathSegments[pathSegments.length - 1];
+        const leafValue = deepFindByKey(item, leafField);
+        if (leafValue !== undefined) {
+            return leafValue;
+        }
+    }
+    return deepFindByKey(item, field);
 }
 function deepFindByKey(source, field) {
     if (!source || typeof source !== 'object') {
@@ -187,7 +200,7 @@ function isExpiryField(fieldConfig) {
     }
     const dbFields = Array.isArray(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields) ? fieldConfig.dbFields : [];
     return dbFields.some((field) => {
-        const normalized = normalizeDbFieldPath(field).toUpperCase();
+        const normalized = String(field !== null && field !== void 0 ? field : '').trim().toUpperCase();
         return normalized === 'EXDT' || normalized.endsWith('.EXDT') || normalized.endsWith('.EXPIRY');
     });
 }
@@ -216,15 +229,7 @@ function shouldSkipFixedTo(header) {
     }
     const dbFields = Array.isArray(header === null || header === void 0 ? void 0 : header.dbFields) ? header.dbFields : [];
     return dbFields.some((field) => {
-        const normalized = normalizeDbFieldPath(field).toUpperCase();
+        const normalized = String(field !== null && field !== void 0 ? field : '').trim().toUpperCase();
         return normalized === 'BN' || normalized === 'BNO' || normalized.endsWith('.BN');
     });
 }
-function normalizeDbFieldPath(field) {
-    const value = String(field !== null && field !== void 0 ? field : '').trim();
-    if (!value) {
-        return '';
-    }
-    const bracketMatch = value.match(/^\[(.*)\]$/);
-    return bracketMatch ? bracketMatch[1].trim() : value;
-}

package/dist/shared/totals-section/pdf-totals.section.js

@@ -8,10 +8,11 @@ const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
 const math_operations_1 = require("../math-operations");
 const pdf_table_section_1 = require("../table-section/pdf-table.section");
 function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintConfigData = {}) {
-    var _a;
+    var _a, _b, _c;
     const normalizedInvoice = invoiceData || {};
     const sType = (0, pdf_shared_utils_1.firstValue)(normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.SType);
-    const hideTopSection = isTruthy((_a = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Settings) === null || _a === void 0 ? void 0 : _a.NoPr);
+    const companyName = (0, pdf_shared_utils_1.firstValue)((_a = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Entity) === null || _a === void 0 ? void 0 : _a.CName, (_b = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Entity) === null || _b === void 0 ? void 0 : _b.Name, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.CName, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.CompanyName);
+    const hideTopSection = isTruthy((_c = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Settings) === null || _c === void 0 ? void 0 : _c.NoPr);
     const isPoSPrint = isTruthy(PrintConfigData === null || PrintConfigData === void 0 ? void 0 : PrintConfigData.IsPoSPrint);
     const shouldShowTaxSummary = resolveShowTaxSummary(normalizedInvoice, PrintConfigData);
     const taxSummary = resolveTaxSummary(normalizedInvoice, shouldShowTaxSummary);
@@ -44,6 +45,7 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         totalInWords,
         notes,
         terms,
+        companyName,
         paidAmount: dueInfo.paid,
         dueAmount: dueInfo.due,
         qrPayload,
@@ -125,14 +127,27 @@ function buildPostTotalsInfoSection(data) {
     }
     if (data.isPoSPrint) {
         leftStack.push({
-            stack: [
-                '* Goods once sold will not be taken back or exchanged',
-                '* PLEASE GET YOUR MEDICINES CHECKED BY YOUR DOCTOR BEFORE USE *'
+            columns: [
+                {
+                    width: '60%',
+                    stack: [
+                        { text: '* Goods once sold will not be taken back or exchanged', fontSize: 6, color: '#111827' },
+                        { text: '* PLEASE GET YOUR MEDICINES CHECKED BY YOUR DOCTOR BEFORE USE *', fontSize: 6, color: '#111827' }
+                    ],
+                    margin: [5, 0, 0, 6],
+                    lineHeight: 1.1
+                },
+                {
+                    width: '40%',
+                    text: `For ${data.companyName || ''}`.trim(),
+                    fontSize: 9,
+                    bold: true,
+                    color: '#111827',
+                    alignment: 'right'
+                }
             ],
-            fontSize: 6,
-            margin: [5, 0, 0, 6],
-            lineHeight: 1.1,
-            color: '#111827'
+            columnGap: 6,
+            margin: [0, 4, 0, 0]
         });
     }
     if (termsText) {
@@ -186,6 +201,9 @@ function buildSignatureSection(PrintConfig, invoiceData, availableWidth) {
     const isPoSPrint = isTruthy((_b = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.IsPoSPrint) !== null && _b !== void 0 ? _b : PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.isPoSPrint);
     const companyName = (0, pdf_shared_utils_1.firstValue)((_c = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _c === void 0 ? void 0 : _c.cName, (_d = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _d === void 0 ? void 0 : _d.CName, (_e = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _e === void 0 ? void 0 : _e.Name, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CName);
     const withPass = !!((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.WithPass));
+    if (isPoSPrint) {
+        return [];
+    }
     const signatureRows = [
         {
             columns: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.6.98",
+  "version": "1.7.00",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tsconfig.json

@@ -14,7 +14,7 @@
 
     /* Language and Environment */
     "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "lib": ["es2017", "dom"],
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -28,7 +28,7 @@
 
     /* Modules */
     "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    "rootDir": "./src",
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */