shareneus 1.5.76 → 1.5.78

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

@@ -63,7 +63,7 @@ function getAvailablePageWidth(pageSize, orientation, margins) {
 function calculateSectionTotals(rows) {
     return rows.reduce((acc, row) => {
         acc.qty += readNumericValue(row, ['Qty']);
-        acc.priceTotal += readNumericValue(row, ['UnPr', 'Pr']);
+        acc.priceTotal += readNumericValue(row, ['UnPr', 'Pr', 'UnCo']);
         acc.discountAmount += readNumericValue(row, ['Disc']);
         acc.cgstAmount += readNumericValue(row, ['CGSTAmt', 'CGST']);
         acc.sgstAmount += readNumericValue(row, ['SGSTAmt', 'SGST']);

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

@@ -9,15 +9,16 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     const normalizedInvoice = invoiceData || {};
     const taxSummary = resolveTaxSummary(normalizedInvoice);
     const showBankDetails = resolveShowBankDetails(normalizedInvoice, PrintConfigData);
+    const showDueSection = shouldShowDueSection(PrintConfigData);
     const bankDetails = showBankDetails ? resolveBankDetails(normalizedInvoice) : { lines: [], hasData: false };
-    const totals = resolveTotals(normalizedInvoice, taxSummary.totalTax);
+    const totals = resolveTotals(normalizedInvoice, taxSummary.totalTax, PrintConfigData);
     const totalInWords = resolveTotalInWords(normalizedInvoice);
     const notes = (0, pdf_shared_utils_1.firstValue)(normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Notes, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Note, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Remarks, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Remark);
     const terms = (0, pdf_shared_utils_1.firstValue)(normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TermsAndConditions, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TermsCondition, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Terms, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TC);
     const dueInfo = resolveDueInfo(normalizedInvoice, totals);
     const qrPayload = resolveQrPayload(normalizedInvoice);
     const hasTopSection = taxSummary.hasData || bankDetails.hasData || totals.hasData;
-    const hasBottomSection = !!(notes || terms || totalInWords || dueInfo.hasData || qrPayload);
+    const hasBottomSection = !!(notes || terms || totalInWords || (showDueSection && dueInfo.hasData) || qrPayload);
     if (!hasTopSection && !hasBottomSection) {
         return [];
     }
@@ -42,7 +43,8 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         terms,
         paidAmount: dueInfo.paid,
         dueAmount: dueInfo.due,
-        qrPayload
+        qrPayload,
+        showDueSection
     });
     if (hasTopSection && hasBottomSection) {
         return [dividerLine, topColumns, bottomColumns];
@@ -56,8 +58,6 @@ 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 paidText = `Paid : Rs.${formatAmountFixed2(data.paidAmount)}`;
-    const dueText = `Due : Rs.${formatAmountFixed2(data.dueAmount)}`;
     const leftStack = [
         {
             columns: [
@@ -66,8 +66,12 @@ function buildPostTotalsInfoSection(data) {
             ],
             columnGap: 6,
             margin: [0, 0, 0, 4]
-        },
-        {
+        }
+    ];
+    if (data.showDueSection) {
+        const paidText = `Paid : Rs.${formatAmountFixed2(data.paidAmount)}`;
+        const dueText = `Due : Rs.${formatAmountFixed2(data.dueAmount)}`;
+        leftStack.push({
             table: {
                 widths: ['*', '*'],
                 body: [[
@@ -82,8 +86,8 @@ function buildPostTotalsInfoSection(data) {
                 vLineColor: () => '#d3d3d3'
             },
             margin: [0, 0, 0, 6]
-        }
-    ];
+        });
+    }
     if (termsText) {
         leftStack.push({
             text: `\u2022 ${termsText}`,
@@ -296,11 +300,14 @@ function buildInfoCardStack(title, lines, options = {}) {
         {
             table: {
                 widths: isRightAlign ? ['*', 6, 'auto'] : ['auto', 6, '*'],
-                body: (body.length > 0 ? body : [{ label: '', value: '-' }]).map((line) => ([
-                    { text: line.label || '', bold: true, fontSize: 8, color: '#111827', alignment: isRightAlign ? 'right' : 'left' },
-                    { text: ':', bold: true, fontSize: 8, color: '#111827', alignment: 'center' },
-                    { text: line.value || '-', fontSize: 8, color: '#111827', alignment: isRightAlign ? 'right' : 'left' }
-                ]))
+                body: (body.length > 0 ? body : [{ label: '', value: '-' }]).map((line) => {
+                    const displayValue = hasDisplayValue(line === null || line === void 0 ? void 0 : line.value) ? String(line.value) : '-';
+                    return [
+                        { text: line.label || '', bold: true, fontSize: 8, color: '#111827', alignment: isRightAlign ? 'right' : 'left' },
+                        { text: ':', bold: true, fontSize: 8, color: '#111827', alignment: 'center' },
+                        { text: displayValue, fontSize: 8, color: '#111827', alignment: isRightAlign ? 'right' : 'left' }
+                    ];
+                })
             },
             layout: 'noBorders'
         }
@@ -398,6 +405,14 @@ function resolveShowBankDetails(invoiceData, printConfigData = {}) {
     const value = (0, pdf_shared_utils_1.firstValue)(printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.ShowBankDetails, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.ShowBankDetails, (_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _a === void 0 ? void 0 : _a.ShowBankDetails);
     return isTruthy(value);
 }
+function shouldShowDueSection(printConfigData = {}) {
+    const type = (0, pdf_shared_utils_1.firstValue)(printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.Type);
+    if (!type) {
+        return false;
+    }
+    const normalizedType = String(type).trim().toLowerCase();
+    return normalizedType === 'invoice' || normalizedType === 'bill';
+}
 function isTruthy(value) {
     if (typeof value === 'boolean') {
         return value;
@@ -411,9 +426,30 @@ function isTruthy(value) {
     }
     return false;
 }
-function resolveTotals(invoiceData, totalTax) {
+function hasDisplayValue(value) {
+    if (value === undefined || value === null) {
+        return false;
+    }
+    if (typeof value === 'number') {
+        return Number.isFinite(value);
+    }
+    if (typeof value === 'string') {
+        return value.trim().length > 0;
+    }
+    return true;
+}
+function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
     const subtotal = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['SubTotal', 'SubTot', 'TaxableAmount', 'TaxableValue']);
-    const discount = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Disc', 'Discount', 'TotDisc']);
+    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));
+    const overallDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Disc, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Discount, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.TotDisc));
+    const hasDetailedDiscSource = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PDisc) !== ''
+        || (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LDisc) !== ''
+        || (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Disc, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Discount, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.TotDisc) !== '';
+    const discount = hasDetailedDiscSource
+        ? itemsDiscount + servicesDiscount + overallDiscount
+        : (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Disc', 'Discount', 'TotDisc']);
     const roundOff = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Round', 'RoundOff']);
     const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal']);
     const totalTaxValue = taxFromInvoice !== 0 ? taxFromInvoice : totalTax;
@@ -432,9 +468,20 @@ function resolveTotals(invoiceData, totalTax) {
         }
     }
     const resolvedFinalTotal = finalTotalRaw ? finalTotal : totalBeforeRound + roundOff;
+    const discountLines = (showDetailedDisc
+        ? [
+            { label: 'Items Discount', amount: itemsDiscount },
+            { label: 'Services Discount', amount: servicesDiscount },
+            { label: 'Overall Discount', amount: overallDiscount }
+        ]
+        : [
+            { label: 'Discount', amount: discount }
+        ])
+        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0)
+        .map((line) => ({ label: line.label, value: formatAmountFixed2(line.amount) }));
     const lines = [
         { label: 'SubTotal', value: formatAmountFixed2(subtotal) },
-        { label: 'Discount', value: formatAmountFixed2(discount) },
+        ...discountLines,
         { label: 'Total Tax', value: formatAmountFixed2(totalTaxValue) },
         { label: 'Total', value: formatAmountFixed2(totalBeforeRound) },
         { label: 'Rounding', value: formatAmountFixed2(roundOff) },
@@ -442,7 +489,7 @@ function resolveTotals(invoiceData, totalTax) {
     ];
     return {
         lines,
-        hasData: lines.some((line) => !!line.value)
+        hasData: lines.some((line) => hasDisplayValue(line === null || line === void 0 ? void 0 : line.value))
     };
 }
 function resolveDueInfo(invoiceData, totals) {
@@ -470,7 +517,36 @@ function parseNumber(value) {
     if (value === undefined || value === null) {
         return 0;
     }
-    const numeric = Number(String(value).replace(/,/g, '').trim());
+    if (typeof value === 'number') {
+        return Number.isFinite(value) ? value : 0;
+    }
+    const raw = String(value).trim();
+    if (!raw) {
+        return 0;
+    }
+    const cleaned = raw.replace(/\s/g, '').replace(/[^0-9,.-]/g, '');
+    if (!cleaned) {
+        return 0;
+    }
+    const commaCount = (cleaned.match(/,/g) || []).length;
+    const dotCount = (cleaned.match(/\./g) || []).length;
+    let normalized = cleaned;
+    if (commaCount > 0 && dotCount > 0) {
+        const lastCommaIndex = cleaned.lastIndexOf(',');
+        const lastDotIndex = cleaned.lastIndexOf('.');
+        const decimalSeparator = lastCommaIndex > lastDotIndex ? ',' : '.';
+        if (decimalSeparator === ',') {
+            normalized = cleaned.replace(/\./g, '').replace(',', '.');
+        }
+        else {
+            normalized = cleaned.replace(/,/g, '');
+        }
+    }
+    else if (commaCount > 0) {
+        const isCommaDecimal = /^-?\d+,\d{1,2}$/.test(cleaned);
+        normalized = isCommaDecimal ? cleaned.replace(',', '.') : cleaned.replace(/,/g, '');
+    }
+    const numeric = Number(normalized);
     return Number.isFinite(numeric) ? numeric : 0;
 }
 function formatTaxRate(value) {
@@ -485,7 +561,7 @@ function formatTaxRate(value) {
     return Number.isFinite(numericValue) ? `${normalized}%` : normalized;
 }
 function resolveTotalInWords(invoiceData) {
-    const roundedTotal = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CustRoundedTotal));
+    const roundedTotal = parseNumber((0, pdf_shared_utils_1.firstValue)((invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CustRoundedTotal) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.RoundedTotal)));
     if (roundedTotal > 0) {
         return convertAmountToWordsINR(roundedTotal);
     }

package/package.json

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