shareneus 1.7.18 → 1.7.20

package/dist/accounting/payment-receive/payment-receipt-pdf/receipt-pdf.service.d.ts

@@ -42,6 +42,20 @@ export declare function CreateReceiptPDFService(DocumentData?: any, PrintConfigD
             columnGap: number;
             stack?: undefined;
             width: string;
+        } | {
+            columns: ({
+                width: number;
+                image: string;
+                fit: number[];
+                margin: number[];
+            } | {
+                width: string;
+                marginLeft: number;
+                stack: any[];
+            })[];
+            columnGap: number;
+            stack?: undefined;
+            width: string;
         })[];
         columnGap: number;
         margin: number[];
@@ -290,6 +304,20 @@ export declare function DownloadReceiptPDFService(filename?: string, DocumentDat
             columnGap: number;
             stack?: undefined;
             width: string;
+        } | {
+            columns: ({
+                width: number;
+                image: string;
+                fit: number[];
+                margin: number[];
+            } | {
+                width: string;
+                marginLeft: number;
+                stack: any[];
+            })[];
+            columnGap: number;
+            stack?: undefined;
+            width: string;
         })[];
         columnGap: number;
         margin: number[];
@@ -538,6 +566,20 @@ export declare function GetReceiptPdfDataUrl(DocumentData?: any, PrintConfigData
             columnGap: number;
             stack?: undefined;
             width: string;
+        } | {
+            columns: ({
+                width: number;
+                image: string;
+                fit: number[];
+                margin: number[];
+            } | {
+                width: string;
+                marginLeft: number;
+                stack: any[];
+            })[];
+            columnGap: number;
+            stack?: undefined;
+            width: string;
         })[];
         columnGap: number;
         margin: number[];
@@ -786,6 +828,20 @@ export declare function buildPdfDocDefinition(DocumentData?: any, PrintConfigDat
             columnGap: number;
             stack?: undefined;
             width: string;
+        } | {
+            columns: ({
+                width: number;
+                image: string;
+                fit: number[];
+                margin: number[];
+            } | {
+                width: string;
+                marginLeft: number;
+                stack: any[];
+            })[];
+            columnGap: number;
+            stack?: undefined;
+            width: string;
         })[];
         columnGap: number;
         margin: number[];

package/dist/shared/header-footer-section/pdf-header-footer.section.d.ts

@@ -77,6 +77,20 @@ export declare function buildDocumentHeaderSection(PrintConfig: any, DocumentDat
         columnGap: number;
         stack?: undefined;
         width: string;
+    } | {
+        columns: ({
+            width: number;
+            image: string;
+            fit: number[];
+            margin: number[];
+        } | {
+            width: string;
+            marginLeft: number;
+            stack: any[];
+        })[];
+        columnGap: number;
+        stack?: undefined;
+        width: string;
     })[];
     columnGap: number;
     margin: number[];

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

@@ -447,6 +447,7 @@ function buildHeaderContentWithLogo(logoDataUrl, hasLogo, organizationStack, log
             logoBlock,
             {
                 width: '*',
+                marginLeft: -25,
                 stack: safeOrganizationStack
             }
         ],

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

@@ -14,7 +14,7 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
             const signedTaxValue = shouldRenderNegativeTaxAmount(item, column)
                 ? negateNumericLikeValue(taxValue)
                 : taxValue;
-            const renderedTaxValue = formatNumericLikeValue(signedTaxValue, fixedTo);
+            const renderedTaxValue = formatNumericLikeValue(signedTaxValue, fixedTo, column.taxKind === 'rate');
             return { text: renderedTaxValue, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, color: pdf_table_config_1.pdfTableStyleConfig.bodyFontColor, alignment: getNumericAlignment(renderedTaxValue) };
         }
         const header = column.header;
@@ -208,12 +208,16 @@ function formatExpiryDateValue(value) {
 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') {
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%')) {
         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 === 'BN' || normalized === 'BNO' || normalized.endsWith('.BN');
+        return normalized === 'BN'
+            || normalized === 'BNO'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
     });
 }

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

@@ -19,7 +19,10 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
     const sType = (_a = PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.SType) !== null && _a !== void 0 ? _a : '';
     const taxMode = resolveInvoiceTaxMode(PDFInvoiceData);
     const showSectionSummaryRows = !resolveIsPoSPrint(PrintConfig);
-    const headerConfig = (0, pdf_table_header_1.GetTableHeader)(PrintConfig.TableConfig, taxMode)[0];
+    const tableConfig = normalizeTableConfig(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.TableConfig, PDFInvoiceData);
+    console.log('tableConfig:', tableConfig);
+    console.log('ShowDiscountColumn:', PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.ShowDiscountColumn);
+    const headerConfig = (0, pdf_table_header_1.GetTableHeader)(tableConfig, taxMode)[0];
     const renderColumns = (0, pdf_table_header_1.getRenderableColumns)(headerConfig, sType);
     const headerRows = (0, pdf_table_header_1.buildHeaderRows)(headerConfig, sType);
     const fixedTo = resolveFixedTo(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.fixedTo);
@@ -187,7 +190,7 @@ function buildFallbackDataRow(item, index, fallbackHeaderRow, fixedTo) {
         if (header.text === 'CGST') {
             if (header.taxKind === 'rate') {
                 const value = (0, pdf_table_row_1.getFirstFieldValue)(item, ['CGSTPerc']);
-                const renderedValue = formatNumericLikeValue(value, fixedTo);
+                const renderedValue = formatNumericLikeValue(value, fixedTo, true);
                 return { text: renderedValue, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, color: pdf_table_config_1.pdfTableStyleConfig.bodyFontColor, alignment: (0, pdf_table_row_1.getNumericAlignment)(renderedValue) };
             }
             else if (header.taxKind === 'amount') {
@@ -199,7 +202,7 @@ function buildFallbackDataRow(item, index, fallbackHeaderRow, fixedTo) {
         if (header.text === 'SGST') {
             if (header.taxKind === 'rate') {
                 const value = (0, pdf_table_row_1.getFirstFieldValue)(item, ['SGSTPerc']);
-                const renderedValue = formatNumericLikeValue(value, fixedTo);
+                const renderedValue = formatNumericLikeValue(value, fixedTo, true);
                 return { text: renderedValue, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, color: pdf_table_config_1.pdfTableStyleConfig.bodyFontColor, alignment: (0, pdf_table_row_1.getNumericAlignment)(renderedValue) };
             }
             else if (header.taxKind === 'amount') {
@@ -210,7 +213,7 @@ function buildFallbackDataRow(item, index, fallbackHeaderRow, fixedTo) {
         }
         if (header.text === 'IGST %') {
             const value = (0, pdf_table_row_1.getFirstFieldValue)(item, ['IGSTPerc']);
-            const renderedValue = formatNumericLikeValue(value, fixedTo);
+            const renderedValue = formatNumericLikeValue(value, fixedTo, true);
             return { text: renderedValue, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, color: pdf_table_config_1.pdfTableStyleConfig.bodyFontColor, alignment: (0, pdf_table_row_1.getNumericAlignment)(renderedValue) };
         }
         if (header.text === 'IGST Amt') {
@@ -222,10 +225,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 = formatNumericLikeValue(getDisplayValueForFallbackRow(item, header.dbFields, shouldNegateFallbackHeaderValue(item, header.text)), fixedTo);
+        const mainValue = formatNumericLikeValue(getDisplayValueForFallbackRow(item, header.dbFields, shouldNegateFallbackHeaderValue(item, header.text)), fixedTo, shouldSkipFixedTo(header));
         const stackedLines = ((_a = header.stackFields) !== null && _a !== void 0 ? _a : [])
             .map((stackField) => {
-            const stackValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, stackField.dbFields), fixedTo);
+            const stackValue = formatNumericLikeValue((0, pdf_table_row_1.getFirstFieldValue)(item, stackField.dbFields), fixedTo, shouldSkipFixedTo(stackField));
             if (!stackValue) {
                 return null;
             }
@@ -355,6 +358,26 @@ function resolveInvoiceTaxMode(pdfInvoiceData) {
     var _a, _b;
     return String((_b = (_a = pdfInvoiceData === null || pdfInvoiceData === void 0 ? void 0 : pdfInvoiceData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) !== null && _b !== void 0 ? _b : '').trim().toUpperCase();
 }
+function normalizeTableConfig(tableConfig, pdfInvoiceData) {
+    if (!Array.isArray(tableConfig) || tableConfig.length === 0) {
+        return Array.isArray(tableConfig) ? tableConfig : [];
+    }
+    console.log('Original Table Config:', pdfInvoiceData === null || pdfInvoiceData === void 0 ? void 0 : pdfInvoiceData.ShowDiscountColumn);
+    if (!(pdfInvoiceData === null || pdfInvoiceData === void 0 ? void 0 : pdfInvoiceData.ShowDiscountColumn)) {
+        return tableConfig;
+    }
+    return tableConfig.map((column) => {
+        if (!isDiscountColumnConfig(column)) {
+            return column;
+        }
+        return Object.assign(Object.assign({}, column), { show: true, Show: true });
+    });
+}
+function isDiscountColumnConfig(column) {
+    var _a, _b, _c;
+    const title = String((_c = (_b = (_a = column === null || column === void 0 ? void 0 : column.title) !== null && _a !== void 0 ? _a : column === null || column === void 0 ? void 0 : column.CustTitle) !== null && _b !== void 0 ? _b : column === null || column === void 0 ? void 0 : column.Tital) !== null && _c !== void 0 ? _c : '').trim();
+    return title === 'Disc %' || title === 'Disc Amount' || title === 'Adisc Amount';
+}
 function buildSectionRows({ rows, columnsOrHeaders, descriptionColumnIndex, label, buildRow, buildTotalRow, showSectionSummaryRows }) {
     const sectionRows = rows.map((row, index) => buildRow(row, index));
     if (!showSectionSummaryRows) {
@@ -376,6 +399,22 @@ function shouldNegateFallbackHeaderValue(item, headerText) {
         || normalized === 'PRICE'
         || normalized === 'LINE TOTAL';
 }
+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.includes('%')) {
+        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 === 'BN'
+            || normalized === 'BNO'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
+    });
+}
 function getDisplayValueForFallbackRow(item, dbFields = [], shouldNegate = false) {
     const value = (0, pdf_table_row_1.getFirstFieldValue)(item, dbFields);
     if (!shouldNegate) {
@@ -387,7 +426,10 @@ function getDisplayValueForFallbackRow(item, dbFields = [], shouldNegate = false
     }
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
-function formatNumericLikeValue(value, fixedTo) {
+function formatNumericLikeValue(value, fixedTo, skipFixedTo = false) {
+    if (skipFixedTo) {
+        return value;
+    }
     if (!value) {
         return value;
     }

package/package.json

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

package/src/shared/header-footer-section/pdf-header-footer.section.ts

@@ -511,6 +511,7 @@ function buildHeaderContentWithLogo(
             logoBlock,
             {
                 width: '*',
+                marginLeft: -25,
                 stack: safeOrganizationStack
             }
         ],

package/src/shared/table-section/pdf-table.row.ts

@@ -8,7 +8,7 @@ export function buildDataRow(item: any, index: number, headerConfig: any[], fixe
             const signedTaxValue = shouldRenderNegativeTaxAmount(item, column)
                 ? negateNumericLikeValue(taxValue)
                 : taxValue;
-            const renderedTaxValue = formatNumericLikeValue(signedTaxValue, fixedTo);
+            const renderedTaxValue = formatNumericLikeValue(signedTaxValue, fixedTo, column.taxKind === 'rate');
             return { text: renderedTaxValue, fontSize: pdfTableStyleConfig.bodyFontSize, color: pdfTableStyleConfig.bodyFontColor, alignment: getNumericAlignment(renderedTaxValue) };
         }
 
@@ -236,13 +236,17 @@ function formatExpiryDateValue(value: string) {
 
 function shouldSkipFixedTo(header: any) {
     const text = String(header?.text ?? '').trim().toUpperCase();
-    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO') {
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%')) {
         return true;
     }
 
     const dbFields = Array.isArray(header?.dbFields) ? header.dbFields : [];
     return dbFields.some((field: any) => {
         const normalized = String(field ?? '').trim().toUpperCase();
-        return normalized === 'BN' || normalized === 'BNO' || normalized.endsWith('.BN');
+        return normalized === 'BN'
+            || normalized === 'BNO'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
     });
 }

package/src/shared/table-section/pdf-table.section.ts

@@ -13,7 +13,10 @@ export function buildInvoiceTableData(PDFInvoiceData: any, PrintConfig: any, ava
     const sType = PDFInvoiceData?.SType ?? '';
     const taxMode = resolveInvoiceTaxMode(PDFInvoiceData);
     const showSectionSummaryRows = !resolveIsPoSPrint(PrintConfig);
-    const headerConfig = GetTableHeader(PrintConfig.TableConfig, taxMode)[0];
+    const tableConfig = normalizeTableConfig(PrintConfig?.TableConfig, PDFInvoiceData);
+    console.log('tableConfig:', tableConfig);
+    console.log('ShowDiscountColumn:', PDFInvoiceData?.ShowDiscountColumn);
+    const headerConfig = GetTableHeader(tableConfig, taxMode)[0];
     const renderColumns = getRenderableColumns(headerConfig, sType);
     const headerRows = buildHeaderRows(headerConfig, sType);
     const fixedTo = resolveFixedTo(PrintConfig?.fixedTo);
@@ -201,7 +204,7 @@ function buildFallbackDataRow(item: any, index: number, fallbackHeaderRow: any[]
         if (header.text === 'CGST') {
             if (header.taxKind === 'rate') {
                 const value = getFirstFieldValue(item, ['CGSTPerc']);
-                const renderedValue = formatNumericLikeValue(value, fixedTo);
+                const renderedValue = formatNumericLikeValue(value, fixedTo, true);
                 return { text: renderedValue, fontSize: pdfTableStyleConfig.bodyFontSize, color: pdfTableStyleConfig.bodyFontColor, alignment: getNumericAlignment(renderedValue) };
             } else if (header.taxKind === 'amount') {
                 const value = getDisplayValueForFallbackRow(item, ['CGSTAmt'], true);
@@ -212,7 +215,7 @@ function buildFallbackDataRow(item: any, index: number, fallbackHeaderRow: any[]
         if (header.text === 'SGST') {
             if (header.taxKind === 'rate') {
                 const value = getFirstFieldValue(item, ['SGSTPerc']);
-                const renderedValue = formatNumericLikeValue(value, fixedTo);
+                const renderedValue = formatNumericLikeValue(value, fixedTo, true);
                 return { text: renderedValue, fontSize: pdfTableStyleConfig.bodyFontSize, color: pdfTableStyleConfig.bodyFontColor, alignment: getNumericAlignment(renderedValue) };
             } else if (header.taxKind === 'amount') {
                 const value = getDisplayValueForFallbackRow(item, ['SGSTAmt'], true);
@@ -222,7 +225,7 @@ function buildFallbackDataRow(item: any, index: number, fallbackHeaderRow: any[]
         }
         if (header.text === 'IGST %') {
             const value = getFirstFieldValue(item, ['IGSTPerc']);
-            const renderedValue = formatNumericLikeValue(value, fixedTo);
+            const renderedValue = formatNumericLikeValue(value, fixedTo, true);
             return { text: renderedValue, fontSize: pdfTableStyleConfig.bodyFontSize, color: pdfTableStyleConfig.bodyFontColor, alignment: getNumericAlignment(renderedValue) };
         }
         if (header.text === 'IGST Amt') {
@@ -236,11 +239,12 @@ function buildFallbackDataRow(item: any, index: number, fallbackHeaderRow: any[]
         }
         const mainValue = formatNumericLikeValue(
             getDisplayValueForFallbackRow(item, header.dbFields, shouldNegateFallbackHeaderValue(item, header.text)),
-            fixedTo
+            fixedTo,
+            shouldSkipFixedTo(header)
         );
         const stackedLines = (header.stackFields ?? [])
             .map((stackField: any) => {
-                const stackValue = formatNumericLikeValue(getFirstFieldValue(item, stackField.dbFields), fixedTo);
+                const stackValue = formatNumericLikeValue(getFirstFieldValue(item, stackField.dbFields), fixedTo, shouldSkipFixedTo(stackField));
                 if (!stackValue) {
                     return null;
                 }
@@ -379,6 +383,35 @@ function resolveInvoiceTaxMode(pdfInvoiceData: any) {
     return String(pdfInvoiceData?.Settings?.Tax ?? '').trim().toUpperCase();
 }
 
+function normalizeTableConfig(tableConfig: any[], pdfInvoiceData: any) {
+    if (!Array.isArray(tableConfig) || tableConfig.length === 0) {
+        return Array.isArray(tableConfig) ? tableConfig : [];
+    }
+
+    console.log('Original Table Config:', pdfInvoiceData?.ShowDiscountColumn);
+
+    if (!pdfInvoiceData?.ShowDiscountColumn) {
+        return tableConfig;
+    }
+
+    return tableConfig.map((column: any) => {
+        if (!isDiscountColumnConfig(column)) {
+            return column;
+        }
+
+        return {
+            ...column,
+            show: true,
+            Show: true
+        };
+    });
+}
+
+function isDiscountColumnConfig(column: any) {
+    const title = String(column?.title ?? column?.CustTitle ?? column?.Tital ?? '').trim();
+    return title === 'Disc %' || title === 'Disc Amount' || title === 'Adisc Amount';
+}
+
 function buildSectionRows({
     rows,
     columnsOrHeaders,
@@ -420,6 +453,23 @@ function shouldNegateFallbackHeaderValue(item: any, headerText: string) {
         || normalized === 'LINE TOTAL';
 }
 
+function shouldSkipFixedTo(header: any) {
+    const text = String(header?.text ?? '').trim().toUpperCase();
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%')) {
+        return true;
+    }
+
+    const dbFields = Array.isArray(header?.dbFields) ? header.dbFields : [];
+    return dbFields.some((field: any) => {
+        const normalized = String(field ?? '').trim().toUpperCase();
+        return normalized === 'BN'
+            || normalized === 'BNO'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
+    });
+}
+
 function getDisplayValueForFallbackRow(item: any, dbFields: string[] = [], shouldNegate: boolean = false) {
     const value = getFirstFieldValue(item, dbFields);
     if (!shouldNegate) {
@@ -434,7 +484,10 @@ function getDisplayValueForFallbackRow(item: any, dbFields: string[] = [], shoul
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 
-function formatNumericLikeValue(value: string, fixedTo: number) {
+function formatNumericLikeValue(value: string, fixedTo: number, skipFixedTo: boolean = false) {
+    if (skipFixedTo) {
+        return value;
+    }
     if (!value) {
         return value;
     }