shareneus 1.6.97 → 1.6.98

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

@@ -94,7 +94,8 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
-    for (const field of dbFields) {
+    const fields = Array.isArray(dbFields) ? dbFields : [dbFields];
+    for (const field of fields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {
             return String(value);
@@ -103,13 +104,14 @@ function getFirstFieldValue(item, dbFields = []) {
     return '';
 }
 function readValue(item, field) {
-    if (!item || !field) {
+    const normalizedField = normalizeDbFieldPath(field);
+    if (!item || !normalizedField) {
         return undefined;
     }
-    if (item[field] !== undefined) {
-        return item[field];
+    if (item[normalizedField] !== undefined) {
+        return item[normalizedField];
     }
-    const dottedPathValue = field.split('.').reduce((current, key) => {
+    const dottedPathValue = normalizedField.split('.').reduce((current, key) => {
         if (current && current[key] !== undefined) {
             return current[key];
         }
@@ -118,7 +120,7 @@ function readValue(item, field) {
     if (dottedPathValue !== undefined) {
         return dottedPathValue;
     }
-    return deepFindByKey(item, field);
+    return deepFindByKey(item, normalizedField);
 }
 function deepFindByKey(source, field) {
     if (!source || typeof source !== 'object') {
@@ -142,6 +144,9 @@ function getNumericAlignment(value) {
     return isNumericLike(value) ? 'right' : 'left';
 }
 function getCellAlignment(headerText, value) {
+    if (isRightAlignedHeader(headerText)) {
+        return 'right';
+    }
     if (isLeftAlignedHeader(headerText)) {
         return 'left';
     }
@@ -155,7 +160,11 @@ function isNumericLike(value) {
     return /^-?\d+(\.\d+)?$/.test(normalized);
 }
 function isLeftAlignedHeader(headerText) {
-    return headerText === 'Qty' || headerText === 'Offer Qty';
+    return false;
+}
+function isRightAlignedHeader(headerText) {
+    const normalizedHeader = String(headerText !== null && headerText !== void 0 ? headerText : '').replace(/\s+/g, '').trim().toUpperCase();
+    return normalizedHeader === 'QTY' || normalizedHeader === 'OFFERQTY';
 }
 function formatNumericLikeValue(value, fixedTo, skipFixedTo = false) {
     if (skipFixedTo) {
@@ -178,7 +187,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 = String(field !== null && field !== void 0 ? field : '').trim().toUpperCase();
+        const normalized = normalizeDbFieldPath(field).toUpperCase();
         return normalized === 'EXDT' || normalized.endsWith('.EXDT') || normalized.endsWith('.EXPIRY');
     });
 }
@@ -207,7 +216,15 @@ function shouldSkipFixedTo(header) {
     }
     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();
+        const normalized = normalizeDbFieldPath(field).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/table-section/pdf-table.section.js

@@ -384,7 +384,10 @@ function shouldNegateFallbackHeaderValue(item, headerText) {
         || normalized === 'LINE TOTAL';
 }
 function getDisplayValueForFallbackRow(item, dbFields = [], shouldNegate = false) {
+    console.log(item, dbFields, shouldNegate);
+    console.log((0, pdf_table_row_1.getFirstFieldValue)(item, dbFields));
     const value = (0, pdf_table_row_1.getFirstFieldValue)(item, dbFields);
+    console.log('value', value);
     if (!shouldNegate) {
         return value;
     }

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

@@ -36,7 +36,7 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         margin: [0, 5, 0, 5]
     };
     const topColumns = {
-        columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals),
+        columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords),
         columnGap: 20,
         margin: [0, 0, 0, 8]
     };
@@ -48,6 +48,7 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         dueAmount: dueInfo.due,
         qrPayload,
         upiPhone: resolveUpiPhone(normalizedInvoice),
+        showInWords: taxSummary.hasData || showBankDetails,
         showDueSection,
         isPoSPrint
     });
@@ -59,7 +60,8 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     }
     return [dividerLine, bottomColumns];
 }
-function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals) {
+function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords) {
+    const inWords = totalInWords || '-';
     if (taxSummary.hasData) {
         return [
             { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows, sType) },
@@ -74,24 +76,34 @@ function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails,
         ];
     }
     return [
-        { width: '*', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
+        {
+            width: '70%',
+            columns: [
+                { width: 'auto', text: 'In Words :', bold: true, fontSize: 9, color: '#111827' },
+                { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
+            ],
+            columnGap: 6,
+            margin: [0, 0, 0, 4]
+        },
+        { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
     ];
 }
 function buildPostTotalsInfoSection(data) {
     const hasQr = !!(0, pdf_shared_utils_1.firstValue)(data.qrPayload);
     const inWords = data.totalInWords || '-';
     const termsText = (0, pdf_shared_utils_1.firstValue)(data.terms);
-    const leftStack = [
-        {
+    const leftStack = [];
+    if (data.showInWords) {
+        leftStack.push({
             columns: [
                 { width: 'auto', text: 'In Words :', bold: true, fontSize: 9, color: '#111827' },
                 { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
             ],
             columnGap: 6,
             margin: [0, 0, 0, 4]
-        }
-    ];
-    if (data.showDueSection) {
+        });
+    }
+    if (data.showDueSection && !data.isPoSPrint) {
         const paidText = `Paid : Rs.${formatAmountFixed2(data.paidAmount)}`;
         const dueText = `Due : Rs.${formatAmountFixed2(data.dueAmount)}`;
         leftStack.push({

package/package.json

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