shareneus 1.5.92 → 1.5.94

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

@@ -73,38 +73,62 @@ function getHeadersBySequence(headers) {
         .map((entry) => entry.header);
 }
 function getRenderableColumns(headerConfig) {
-    const hasTaxPercent = headerConfig.some((header) => header.text === 'Tax %');
-    const hasTaxAmount = headerConfig.some((header) => header.text === 'Tax Amount');
+    const hasTaxPercent = headerConfig.some((header) => isTaxPercentHeader(header));
+    const hasTaxAmount = headerConfig.some((header) => isTaxAmountHeader(header));
     const hasTaxGroup = hasTaxPercent && hasTaxAmount;
     const columns = [];
     for (const header of headerConfig) {
-        if (hasTaxGroup && header.text === 'Tax %') {
+        if (hasTaxGroup && isTaxPercentHeader(header)) {
             columns.push({
                 type: 'tax',
                 taxKind: 'rate',
-                taxName: '%',
                 dbField: 'CGST',
                 width: getTaxSubWidth(header.width),
             }, {
                 type: 'tax',
                 taxKind: 'amount',
                 dbField: 'CGST',
-                taxName: 'Amount',
                 width: getTaxSubWidth(header.width),
             });
             continue;
         }
-        if (hasTaxGroup && header.text === 'Tax Amount') {
+        if (hasTaxGroup && isTaxAmountHeader(header)) {
             columns.push({
                 type: 'tax',
                 taxKind: 'rate',
-                taxName: '%',
                 dbField: 'SGST',
                 width: getTaxSubWidth(header.width),
             }, {
                 type: 'tax',
                 taxKind: 'amount',
-                taxName: 'Amount',
+                dbField: 'SGST',
+                width: getTaxSubWidth(header.width),
+            });
+            continue;
+        }
+        if (!hasTaxGroup && isTaxPercentHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'rate',
+                dbField: 'CGST',
+                width: getTaxSubWidth(header.width),
+            }, {
+                type: 'tax',
+                taxKind: 'rate',
+                dbField: 'SGST',
+                width: getTaxSubWidth(header.width),
+            });
+            continue;
+        }
+        if (!hasTaxGroup && isTaxAmountHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'amount',
+                dbField: 'CGST',
+                width: getTaxSubWidth(header.width),
+            }, {
+                type: 'tax',
+                taxKind: 'amount',
                 dbField: 'SGST',
                 width: getTaxSubWidth(header.width),
             });
@@ -119,13 +143,13 @@ function getRenderableColumns(headerConfig) {
     return columns;
 }
 function buildHeaderRows(headerConfig) {
-    const hasTaxPercent = headerConfig.some((header) => header.text === 'Tax %');
-    const hasTaxAmount = headerConfig.some((header) => header.text === 'Tax Amount');
+    const hasTaxPercent = headerConfig.some((header) => isTaxPercentHeader(header));
+    const hasTaxAmount = headerConfig.some((header) => isTaxAmountHeader(header));
     const hasTaxGroup = hasTaxPercent && hasTaxAmount;
     const hasDiscPercent = headerConfig.some((header) => header.text === 'Disc %');
     const hasDiscAmount = headerConfig.some((header) => isDiscountAmountHeader(header.text));
     const hasDiscGroup = hasDiscPercent && hasDiscAmount;
-    const hasGroupedHeaders = hasTaxGroup || hasDiscGroup;
+    const hasGroupedHeaders = hasTaxPercent || hasTaxAmount || hasDiscGroup;
     if (!hasGroupedHeaders) {
         const singleRow = headerConfig.map((header) => (Object.assign({ text: header.text, dbFields: header.dbFields, stackFields: header.stackFields }, getHeaderCellStyle())));
         return [singleRow];
@@ -133,16 +157,26 @@ function buildHeaderRows(headerConfig) {
     const topRow = [];
     const subRow = [];
     for (const header of headerConfig) {
-        if (hasTaxGroup && header.text === 'Tax %') {
+        if (hasTaxGroup && isTaxPercentHeader(header)) {
             topRow.push(Object.assign({ text: 'CGST', colSpan: 2, alignment: 'center' }, getHeaderCellStyle()), {});
             subRow.push(Object.assign({ text: '%', alignment: 'center' }, getHeaderCellStyle()), Object.assign({ text: 'Amt', alignment: 'center' }, getHeaderCellStyle()));
             continue;
         }
-        if (hasTaxGroup && header.text === 'Tax Amount') {
+        if (hasTaxGroup && isTaxAmountHeader(header)) {
             topRow.push(Object.assign({ text: 'SGST/UGST', colSpan: 2, alignment: 'center' }, getHeaderCellStyle()), {});
             subRow.push(Object.assign({ text: '%', alignment: 'center' }, getHeaderCellStyle()), Object.assign({ text: 'Amt', alignment: 'center' }, getHeaderCellStyle()));
             continue;
         }
+        if (!hasTaxGroup && isTaxPercentHeader(header)) {
+            topRow.push(Object.assign({ text: header.text, colSpan: 2, alignment: 'center' }, getHeaderCellStyle()), {});
+            subRow.push(Object.assign({ text: 'CGST', alignment: 'center' }, getHeaderCellStyle()), Object.assign({ text: 'SGST/UGST', alignment: 'center' }, getHeaderCellStyle()));
+            continue;
+        }
+        if (!hasTaxGroup && isTaxAmountHeader(header)) {
+            topRow.push(Object.assign({ text: header.text, colSpan: 2, alignment: 'center' }, getHeaderCellStyle()), {});
+            subRow.push(Object.assign({ text: 'CGST', alignment: 'center' }, getHeaderCellStyle()), Object.assign({ text: 'SGST/UGST', alignment: 'center' }, getHeaderCellStyle()));
+            continue;
+        }
         if (hasDiscGroup && header.text === 'Disc %') {
             topRow.push(Object.assign({ text: 'Discount', colSpan: 2, alignment: 'center' }, getHeaderCellStyle()), {});
             subRow.push(Object.assign({ text: '%', alignment: 'center' }, getHeaderCellStyle()), Object.assign({ text: 'Amt', alignment: 'center' }, getHeaderCellStyle()));
@@ -165,6 +199,18 @@ function getTaxSubWidth(width) {
 function isDiscountAmountHeader(text) {
     return text === 'Disc Amount' || text === 'Adisc Amount';
 }
+function isTaxPercentHeader(header) {
+    return normalizeHeaderText(header === null || header === void 0 ? void 0 : header.text) === 'TAX%';
+}
+function isTaxAmountHeader(header) {
+    return normalizeHeaderText(header === null || header === void 0 ? void 0 : header.text) === 'TAXAMOUNT';
+}
+function normalizeHeaderText(value) {
+    return String(value !== null && value !== void 0 ? value : '')
+        .replace(/\s+/g, '')
+        .trim()
+        .toUpperCase();
+}
 function getHeaderCellStyle() {
     return {
         bold: true,

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

@@ -46,12 +46,6 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
     });
 }
 function formatFieldValue(item, fieldConfig, fixedTo) {
-    if (isTaxPercentHeader(fieldConfig)) {
-        return formatCombinedTaxValue(item, 'rate', fixedTo);
-    }
-    if (isTaxAmountHeader(fieldConfig)) {
-        return formatCombinedTaxValue(item, 'amount', fixedTo);
-    }
     const rawValue = getFirstFieldValue(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields);
     if (isExpiryField(fieldConfig)) {
         return formatExpiryDateValue(rawValue);
@@ -182,33 +176,3 @@ function shouldSkipFixedTo(header) {
         return normalized === 'BN' || normalized === 'BNO' || normalized.endsWith('.BN');
     });
 }
-function isTaxPercentHeader(fieldConfig) {
-    const normalized = normalizeHeaderText(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text);
-    return normalized === 'TAX%';
-}
-function isTaxAmountHeader(fieldConfig) {
-    const normalized = normalizeHeaderText(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text);
-    return normalized === 'TAXAMOUNT';
-}
-function normalizeHeaderText(value) {
-    return String(value !== null && value !== void 0 ? value : '')
-        .replace(/\s+/g, '')
-        .trim()
-        .toUpperCase();
-}
-function formatCombinedTaxValue(item, kind, fixedTo) {
-    const cgstField = kind === 'rate' ? 'CGSTPerc' : 'CGSTAmt';
-    const sgstField = kind === 'rate' ? 'SGSTPerc' : 'SGSTAmt';
-    const cgstValue = formatNumericLikeValue(getFirstFieldValue(item, [cgstField, 'CGST']), fixedTo);
-    const sgstValue = formatNumericLikeValue(getFirstFieldValue(item, [sgstField, 'SGST']), fixedTo);
-    if (cgstValue && sgstValue) {
-        return `CGST: ${cgstValue} | SGST/UGST: ${sgstValue}`;
-    }
-    if (cgstValue) {
-        return `CGST: ${cgstValue}`;
-    }
-    if (sgstValue) {
-        return `SGST/UGST: ${sgstValue}`;
-    }
-    return '';
-}

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

@@ -186,10 +186,10 @@ function buildFallbackDataRow(item, index, fallbackHeaderRow, fixedTo) {
             const value = String(index + 1);
             return { text: value, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, color: pdf_table_config_1.pdfTableStyleConfig.bodyFontColor, alignment: (0, pdf_table_row_1.getNumericAlignment)(value) };
         }
-        const mainValue = formatFallbackFieldValue(item, header, fixedTo);
+        const mainValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, header.dbFields), fixedTo);
         const stackedLines = ((_a = header.stackFields) !== null && _a !== void 0 ? _a : [])
             .map((stackField) => {
-            const stackValue = formatFallbackFieldValue(item, stackField, fixedTo);
+            const stackValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, stackField.dbFields), fixedTo);
             if (!stackValue) {
                 return null;
             }
@@ -315,40 +315,3 @@ function formatNumericLikeValue(value, fixedTo) {
     }
     return normalized.toFixed(fixedTo);
 }
-function formatFallbackFieldValue(item, fieldConfig, fixedTo) {
-    if (isTaxPercentHeader(fieldConfig)) {
-        return formatCombinedTaxValue(item, 'rate', fixedTo);
-    }
-    if (isTaxAmountHeader(fieldConfig)) {
-        return formatCombinedTaxValue(item, 'amount', fixedTo);
-    }
-    return formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields), fixedTo);
-}
-function isTaxPercentHeader(fieldConfig) {
-    return normalizeHeaderText(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text) === 'TAX%';
-}
-function isTaxAmountHeader(fieldConfig) {
-    return normalizeHeaderText(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text) === 'TAXAMOUNT';
-}
-function normalizeHeaderText(value) {
-    return String(value !== null && value !== void 0 ? value : '')
-        .replace(/\s+/g, '')
-        .trim()
-        .toUpperCase();
-}
-function formatCombinedTaxValue(item, kind, fixedTo) {
-    const cgstField = kind === 'rate' ? 'CGSTPerc' : 'CGSTAmt';
-    const sgstField = kind === 'rate' ? 'SGSTPerc' : 'SGSTAmt';
-    const cgstValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, [cgstField, 'CGST']), fixedTo);
-    const sgstValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, [sgstField, 'SGST']), fixedTo);
-    if (cgstValue && sgstValue) {
-        return `CGST: ${cgstValue} | SGST/UGST: ${sgstValue}`;
-    }
-    if (cgstValue) {
-        return `CGST: ${cgstValue}`;
-    }
-    if (sgstValue) {
-        return `SGST/UGST: ${sgstValue}`;
-    }
-    return '';
-}

package/package.json

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