shareneus 1.6.96 → 1.6.98

package/dist/accounting/invoice/invoice-pdf/invoice-pdf.service.js

@@ -194,12 +194,12 @@ function GetHeaderInfo(Entity, marginleft, InvoicePDFData = {}) {
     if (!tr_utils_1.TrUtils.IsEmpty(Entity.DLNo)) {
         TaxInfo.push({ text: 'D.L.NO : ' + Entity.DLNo, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: '*' });
     }
-    TaxInfo.push(GetBillofSupplyName(InvoicePDFData.Settings));
+    // TaxInfo.push(GetBillofSupplyName(InvoicePDFData.Settings));
     return TaxInfo;
 }
-function GetBillofSupplyName(Settings) {
-    return { text: Settings.Tax === 'BS' ? ' Bill of Supply' : null, alignment: 'center', marginLeft: 15, marginTop: 2, marginBottom: 3, fontSize: 9, width: 'auto' };
-}
+// function GetBillofSupplyName(Settings: any) {
+//     return { text: Settings.Tax === 'BS' ? ' Bill of Supply' : null, alignment: 'center', marginLeft: 15, marginTop: 2, marginBottom: 3, fontSize: 9, width: 'auto' };
+// }
 // function SalesReceiptHeaderData(Entity: any, Image: any, AColor: any, HColor: any, text: any) {
 //     return [
 //         SharedPDFService.GetMainHeader(Entity, Image, AColor, HColor, text),

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

@@ -18,6 +18,8 @@ function GetTableHeader(itemsHeader) {
             text: itemTitle,
             width: itemWidth,
             bold: (_l = item.bold) !== null && _l !== void 0 ? _l : true,
+            fontSize: 9,
+            alignment: resolveHeaderAlignment(itemTitle),
             dbFields: itemDbFields,
             stackParent: stackTitle,
             stackSeq: typeof stackSeq === 'number' ? stackSeq : Number.MAX_SAFE_INTEGER
@@ -191,7 +193,7 @@ function buildHeaderRows(headerConfig, sType = '') {
     const hasDiscGroup = hasDiscPercent && hasDiscAmount;
     const hasGroupedHeaders = hasTaxPercent || hasTaxAmount || hasDiscGroup;
     if (!hasGroupedHeaders) {
-        const singleRow = headerConfig.map((header) => (Object.assign({ text: header.text, dbFields: header.dbFields, stackFields: header.stackFields }, getHeaderCellStyle())));
+        const singleRow = headerConfig.map((header) => (Object.assign({ text: header.text, alignment: header.alignment, dbFields: header.dbFields, stackFields: header.stackFields }, getHeaderCellStyle())));
         return [singleRow];
     }
     const topRow = [];
@@ -246,7 +248,7 @@ function buildHeaderRows(headerConfig, sType = '') {
         if (hasDiscGroup && isDiscountAmountHeader(header.text)) {
             continue;
         }
-        topRow.push(Object.assign({ text: header.text, rowSpan: 2 }, getHeaderCellStyle()));
+        topRow.push(Object.assign({ text: header.text, rowSpan: 2, alignment: header.alignment }, getHeaderCellStyle()));
         subRow.push({});
     }
     return [topRow, subRow];
@@ -272,6 +274,13 @@ function normalizeHeaderText(value) {
         .trim()
         .toUpperCase();
 }
+function resolveHeaderAlignment(title) {
+    const normalizedTitle = normalizeHeaderText(title);
+    if (normalizedTitle === 'LINETOTAL' || normalizedTitle === 'PRICE' || normalizedTitle === 'QTY') {
+        return 'right';
+    }
+    return undefined;
+}
 function getHeaderCellStyle() {
     return {
         bold: true,

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): string;
+export declare function getFirstFieldValue(item: any, dbFields?: 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

@@ -7,6 +7,7 @@ exports.getCellAlignment = getCellAlignment;
 const pdf_table_config_1 = require("./pdf-table.config");
 const my_date_1 = require("../../utils/my-date");
 function buildDataRow(item, index, headerConfig, fixedTo = 2) {
+    console.log('Building data row for headerConfig:', headerConfig);
     return headerConfig.map((column) => {
         var _a;
         if (column.type === 'tax') {
@@ -49,7 +50,7 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
     });
 }
 function formatFieldValue(item, fieldConfig, fixedTo) {
-    const rawValue = getDisplayFieldValue(item, fieldConfig);
+    const rawValue = getFirstFieldValue(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields);
     if (isExpiryField(fieldConfig)) {
         return formatExpiryDateValue(rawValue);
     }
@@ -58,17 +59,6 @@ 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'];
@@ -104,8 +94,8 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
-    const normalizedFields = normalizeDbFields(dbFields);
-    for (const field of normalizedFields) {
+    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);
@@ -114,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];
         }
@@ -129,16 +120,7 @@ function readValue(item, field) {
     if (dottedPathValue !== undefined) {
         return dottedPathValue;
     }
-    return deepFindByKey(item, field);
-}
-function normalizeDbFields(dbFields) {
-    if (Array.isArray(dbFields)) {
-        return dbFields;
-    }
-    if (typeof dbFields === 'string') {
-        return dbFields ? [dbFields] : [];
-    }
-    return [];
+    return deepFindByKey(item, normalizedField);
 }
 function deepFindByKey(source, field) {
     if (!source || typeof source !== 'object') {
@@ -162,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';
     }
@@ -175,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) {
@@ -198,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');
     });
 }
@@ -219,17 +208,6 @@ 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();
@@ -238,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({
@@ -520,7 +532,9 @@ function hasDisplayValue(value) {
     return true;
 }
 function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
+    var _a;
     const subtotal = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['SIndTotal', 'STotal', 'SubTotal', 'SubTot', 'TaxableAmount', 'TaxableValue']);
+    const isPoSPrint = isTruthy((_a = printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.IsPoSPrint) !== null && _a !== void 0 ? _a : printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.isPoSPrint);
     const showDetailedDisc = isTruthy((0, pdf_shared_utils_1.firstValue)(printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.ShowDetailedDisc));
     const itemsDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PDisc));
     const servicesDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LDisc));
@@ -539,6 +553,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
     const returnTotal = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.RetTotal);
     const finalTotalRaw = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.FinalTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Total, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.GrandTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.NetTotal);
     const finalTotal = parseNumber(finalTotalRaw);
+    const paidAmount = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Paid', 'PaidAmount', 'PaidAmt', 'ReceivedAmount', 'RecAmt']);
     let totalBeforeRound = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalBeforeRound', 'BeforeRoundTotal', 'PreRoundTotal']);
     if (totalBeforeRound === 0) {
         if (finalTotalRaw) {
@@ -552,6 +567,8 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         }
     }
     const resolvedFinalTotal = finalTotalRaw ? finalTotal : totalBeforeRound + roundOff;
+    const dueFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Due', 'DueAmount', 'DueAmt', 'Balance', 'BalAmt']);
+    const dueAmount = dueFromInvoice !== 0 ? dueFromInvoice : Math.max(0, resolvedFinalTotal - paidAmount);
     const discountLines = (showDetailedDisc
         ? [
             { label: 'Items Discount', amount: itemsDiscount },
@@ -561,7 +578,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         : [
             { label: 'Discount', amount: (0, math_operations_1.Add)(overalItemsDiscount, overalServicesDiscount) }
         ])
-        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0);
+        .filter((line) => parseNumber(line === null || line === void 0 ? void 0 : line.amount) !== 0);
     const totalLines = [
         { label: 'SubTotal', amount: subtotal },
         ...discountLines,
@@ -569,10 +586,11 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         { label: 'Return Total', amount: returnTotal },
         { label: 'Total', amount: totalBeforeRound },
         { label: 'Rounding', amount: roundOff },
-        { label: 'Final Total', amount: resolvedFinalTotal }
+        ...(roundOff !== 0 ? [{ label: 'Final Total', amount: resolvedFinalTotal }] : []),
+        ...(isPoSPrint ? [{ label: 'Due', amount: dueAmount }] : [])
     ];
     const lines = totalLines
-        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0)
+        .filter((line) => parseNumber(line === null || line === void 0 ? void 0 : line.amount) !== 0)
         .map((line) => ({ label: line.label, value: formatAmountFixed2(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) }));
     const hasData = lines.some((line) => hasDisplayValue(line === null || line === void 0 ? void 0 : line.value));
     return {

package/package.json

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