shareneus 1.6.95 → 1.6.96

package/dist/shared/table-section/pdf-table.row.d.ts

@@ -11,6 +11,6 @@ export declare function buildDataRow(item: any, index: number, headerConfig: any
     color?: undefined;
     alignment?: undefined;
 })[];
-export declare function getFirstFieldValue(item: any, dbFields?: string[]): string;
+export declare function getFirstFieldValue(item: any, dbFields?: string[] | string): string;
 export declare function getNumericAlignment(value: string): "left" | "right";
 export declare function getCellAlignment(headerText: string, value: string): "left" | "right";

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

@@ -49,7 +49,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);
+    const rawValue = getDisplayFieldValue(item, fieldConfig);
     if (isExpiryField(fieldConfig)) {
         return formatExpiryDateValue(rawValue);
     }
@@ -58,6 +58,17 @@ function formatFieldValue(item, fieldConfig, fixedTo) {
         : rawValue;
     return formatNumericLikeValue(signedValue, fixedTo, shouldSkipFixedTo(fieldConfig));
 }
+function getDisplayFieldValue(item, fieldConfig) {
+    const directValue = getFirstFieldValue(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields);
+    if (directValue) {
+        return directValue;
+    }
+    const fallbackFields = getFallbackDbFields(fieldConfig);
+    if (fallbackFields.length === 0) {
+        return '';
+    }
+    return getFirstFieldValue(item, fallbackFields);
+}
 function getTaxValue(item, taxName, taxKind) {
     if (taxName === 'IGST') {
         const fields = taxKind === 'rate' ? ['IGSTPerc'] : ['IGSTAmt'];
@@ -93,7 +104,8 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
-    for (const field of dbFields) {
+    const normalizedFields = normalizeDbFields(dbFields);
+    for (const field of normalizedFields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {
             return String(value);
@@ -119,6 +131,15 @@ function readValue(item, field) {
     }
     return deepFindByKey(item, field);
 }
+function normalizeDbFields(dbFields) {
+    if (Array.isArray(dbFields)) {
+        return dbFields;
+    }
+    if (typeof dbFields === 'string') {
+        return dbFields ? [dbFields] : [];
+    }
+    return [];
+}
 function deepFindByKey(source, field) {
     if (!source || typeof source !== 'object') {
         return undefined;
@@ -198,18 +219,26 @@ function formatExpiryDateValue(value) {
     }
     return my_date_1.MyDate.ConvertUTCDateToReadableExDate(input) || input;
 }
+function getFallbackDbFields(fieldConfig) {
+    var _a;
+    const text = String((_a = fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text) !== null && _a !== void 0 ? _a : '').trim().toUpperCase();
+    if (text === 'BN' || text === 'BATCH' || text === 'BATCH NO' || text === 'BATCH NO.') {
+        return ['Batch.BN', 'Batch.MBN', 'BN'];
+    }
+    if (text === 'EXDT' || text === 'EXPIRY' || text === 'EXPIRY DATE') {
+        return ['Batch.ExDt', 'ExDt'];
+    }
+    return [];
+}
 function shouldSkipFixedTo(header) {
     var _a;
     const text = String((_a = header === null || header === void 0 ? void 0 : header.text) !== null && _a !== void 0 ? _a : '').trim().toUpperCase();
-    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text === 'BATCH' || text === 'BATCH NO' || text === 'BATCH NO.') {
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO') {
         return true;
     }
     const dbFields = Array.isArray(header === null || header === void 0 ? void 0 : header.dbFields) ? header.dbFields : [];
     return dbFields.some((field) => {
         const normalized = String(field !== null && field !== void 0 ? field : '').trim().toUpperCase();
-        return normalized === 'BNO'
-            || normalized.endsWith('.BNO')
-            || normalized.endsWith('.BN')
-            || normalized.includes('BATCH');
+        return normalized === 'BN' || normalized === 'BNO' || normalized.endsWith('.BN');
     });
 }

package/package.json

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