shareneus 1.7.325 → 1.7.327

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

@@ -126,6 +126,7 @@ function negateNumericLikeValue(value) {
 function getFirstFieldValue(item, dbFields = []) {
     for (const field of dbFields) {
         const value = readValue(item, field);
+        console.log(`getFirstFieldValue - field: ${field}, value: ${value}`);
         if (value !== undefined && value !== null && value !== '') {
             return String(value);
         }

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

@@ -423,6 +423,8 @@ function shouldSkipFixedTo(header) {
     });
 }
 function getDisplayValueForFallbackRow(item, dbFields = [], shouldNegate = false) {
+    console.log(item, dbFields);
+    console.log('getFirstFieldValue', (0, pdf_table_row_1.getFirstFieldValue)(item, dbFields));
     const value = (0, pdf_table_row_1.getFirstFieldValue)(item, dbFields);
     if (!shouldNegate) {
         return value;

package/dist/shared/transactions-pdf.service.js

@@ -153,6 +153,7 @@ function GetDebitNotePDF(debitNoteData, entityData, headerConfig, printConfig, t
         dnPrint = debit_note_print_service_1.DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData, entityData, image, true, true, taxCodes, false, true);
     }
     else {
+        console.log('DebitNotePrintData before formatting', debitNotePrintData);
         debitNotePrintData.Round = tr_utils_1.TrUtils.FixedTo(debitNoteData.Round);
         debitNotePrintData.Total = tr_utils_1.TrUtils.FixedTo(debitNoteData.Total);
         debitNotePrintData.SubToal = tr_utils_1.TrUtils.FixedTo(debitNoteData.SubToal);

package/package.json

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

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

@@ -59,53 +59,53 @@ function formatFieldValue(item: any, fieldConfig: any, fixedTo: number) {
     return formatNumericLikeValue(signedValue, fixedTo, shouldSkipFixedTo(fieldConfig));
 }
 
-function getTaxValue(item: any, taxName: 'CGST' | 'SGST' | 'IGST' | 'GST', taxKind: 'rate' | 'amount') {
-    if (taxName === 'GST') {
-        if (taxKind === 'rate') {
-            return getCombinedTaxValue(item, ['CombinedTaxPercentage', 'GSTPerc'], [
-                ['CGSTPerc', 'CGST'],
-                ['SGSTPerc', 'SGST'],
-                ['IGSTPerc', 'IGST']
-            ]);
-        }
-        return getCombinedTaxValue(item, ['TotalTaxAmount', 'TaxAmount', 'GSTAmt'], [
-            ['CGSTAmt', 'CGST'],
-            ['SGSTAmt', 'SGST'],
-            ['IGSTAmt', 'IGST']
-        ]);
-    }
-
-    if (taxName === 'IGST') {
-        const fields = taxKind === 'rate' ? ['IGSTPerc'] : ['IGSTAmt'];
-        return getFirstFieldValue(item, fields);
-    }
+function getTaxValue(item: any, taxName: 'CGST' | 'SGST' | 'IGST' | 'GST', taxKind: 'rate' | 'amount') {
+    if (taxName === 'GST') {
+        if (taxKind === 'rate') {
+            return getCombinedTaxValue(item, ['CombinedTaxPercentage', 'GSTPerc'], [
+                ['CGSTPerc', 'CGST'],
+                ['SGSTPerc', 'SGST'],
+                ['IGSTPerc', 'IGST']
+            ]);
+        }
+        return getCombinedTaxValue(item, ['TotalTaxAmount', 'TaxAmount', 'GSTAmt'], [
+            ['CGSTAmt', 'CGST'],
+            ['SGSTAmt', 'SGST'],
+            ['IGSTAmt', 'IGST']
+        ]);
+    }
+
+    if (taxName === 'IGST') {
+        const fields = taxKind === 'rate' ? ['IGSTPerc'] : ['IGSTAmt'];
+        return getFirstFieldValue(item, fields);
+    }
     const fields = taxKind === 'rate'
         ? [`${taxName}Perc`, taxName]
         : [`${taxName}Amt`, taxName];
-    return getFirstFieldValue(item, fields);
-}
-
-function getCombinedTaxValue(item: any, combinedFields: string[], componentFieldGroups: string[][]) {
-    const combinedValue = getFirstFieldValue(item, combinedFields);
-    if (combinedValue) {
-        return combinedValue;
-    }
-
-    const values = componentFieldGroups
-        .map((fields: string[]) => getFirstFieldValue(item, fields))
-        .filter((value: string) => value !== '');
-
-    if (values.length === 0) {
-        return '';
-    }
-
-    const numericValues = values.map((value: string) => Number(value.replace(/,/g, '').trim()));
-    if (numericValues.some((value: number) => !Number.isFinite(value))) {
-        return values[0];
-    }
-
-    return String(numericValues.reduce((sum: number, value: number) => sum + value, 0));
-}
+    return getFirstFieldValue(item, fields);
+}
+
+function getCombinedTaxValue(item: any, combinedFields: string[], componentFieldGroups: string[][]) {
+    const combinedValue = getFirstFieldValue(item, combinedFields);
+    if (combinedValue) {
+        return combinedValue;
+    }
+
+    const values = componentFieldGroups
+        .map((fields: string[]) => getFirstFieldValue(item, fields))
+        .filter((value: string) => value !== '');
+
+    if (values.length === 0) {
+        return '';
+    }
+
+    const numericValues = values.map((value: string) => Number(value.replace(/,/g, '').trim()));
+    if (numericValues.some((value: number) => !Number.isFinite(value))) {
+        return values[0];
+    }
+
+    return String(numericValues.reduce((sum: number, value: number) => sum + value, 0));
+}
 
 function shouldRenderNegativeTaxAmount(item: any, column: any) {
     return !!item?.Ret && column?.taxKind === 'amount';
@@ -139,6 +139,7 @@ function negateNumericLikeValue(value: string) {
 export function getFirstFieldValue(item: any, dbFields: string[] = []) {
     for (const field of dbFields) {
         const value = readValue(item, field);
+        console.log(`getFirstFieldValue - field: ${field}, value: ${value}`);
         if (value !== undefined && value !== null && value !== '') {
             return String(value);
         }
@@ -274,23 +275,23 @@ function formatExpiryDateValue(value: string) {
 function shouldSkipFixedTo(header: any) {
     const text = String(header?.text ?? '').trim().toUpperCase();
     const normalizedText = text.replace(/\s+/g, '');
-    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%') || normalizedText === 'QTY' || normalizedText === 'OFFERQTY' || normalizedText === 'OFQTY' || normalizedText === 'MPN') {
-        return true;
-    }
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%') || normalizedText === 'QTY' || normalizedText === 'OFFERQTY' || normalizedText === 'OFQTY' || normalizedText === 'MPN') {
+        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 === 'QTY'
-            || normalized === 'OFQTY'
-            || normalized === 'MPN'
-            || normalized.endsWith('.BN')
-            || normalized.endsWith('.QTY')
-            || normalized.endsWith('.OFQTY')
-            || normalized.endsWith('.MPN')
-            || normalized.endsWith('PERC')
-            || normalized.endsWith('.PERC');
+            || normalized === 'BNO'
+            || normalized === 'QTY'
+            || normalized === 'OFQTY'
+            || normalized === 'MPN'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('.QTY')
+            || normalized.endsWith('.OFQTY')
+            || normalized.endsWith('.MPN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
     });
 }

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

@@ -477,6 +477,8 @@ function shouldSkipFixedTo(header: any) {
 }
 
 function getDisplayValueForFallbackRow(item: any, dbFields: string[] = [], shouldNegate: boolean = false) {
+    console.log(item, dbFields);
+    console.log('getFirstFieldValue', getFirstFieldValue(item, dbFields));
     const value = getFirstFieldValue(item, dbFields);
     if (!shouldNegate) {
         return value;

package/src/shared/transactions-pdf.service.ts

@@ -167,6 +167,7 @@ export function GetDebitNotePDF(debitNoteData: any, entityData: any, headerConfi
     if (options.ConsolidateGST) {
         dnPrint = DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData,entityData, image,true, true, taxCodes, false, true);
     } else {
+        console.log('DebitNotePrintData before formatting', debitNotePrintData);
         debitNotePrintData.Round = TrUtils.FixedTo(debitNoteData.Round);
         debitNotePrintData.Total = TrUtils.FixedTo(debitNoteData.Total);
         debitNotePrintData.SubToal = TrUtils.FixedTo(debitNoteData.SubToal);