shareneus 1.6.59 → 1.6.61

package/dist/inventory/items/issue-parts-pdf.service.js

@@ -87,10 +87,19 @@ class IssuePartsprintService {
                 }
                 else {
                     for (let i = 0; i < ROPrintData.PrintInfo.length; i++) {
-                        if (tr_utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
-                            ROPrintData.PrintInfo[i].Text = '';
+                        // if (TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
+                        //     ROPrintData.PrintInfo[i].Text = '';
+                        // }
+                        const printInfo = ROPrintData.PrintInfo[i];
+                        const hasText = !tr_utils_1.TrUtils.IsNull(printInfo.Text) && ('' + printInfo.Text).trim() !== '';
+                        const hasPartsOrOps = (!tr_utils_1.TrUtils.IsNull(printInfo.Items) && printInfo.Items.length > 0)
+                            || (!tr_utils_1.TrUtils.IsNull(printInfo.Ops) && printInfo.Ops.length > 0);
+                        if (hasText) {
+                            List.push(ROPrintData.PrintInfo[i].Text);
+                        }
+                        if (hasPartsOrOps) {
+                            List.push(this.GetWithOutDiscAndTaxFieldHeader(tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Ops), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn, isAuto, ROPrintData.Entity.DecimalsNumber));
                         }
-                        List.push(ROPrintData.PrintInfo[i].Text, this.GetWithOutDiscAndTaxFieldHeader(tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Ops), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn, isAuto, ROPrintData.Entity.DecimalsNumber));
                     }
                 }
             }
@@ -183,14 +192,16 @@ class IssuePartsprintService {
                 let Taxable = 0;
                 let FinalTotal = 0;
                 Parts.forEach((part) => {
-                    // console.log('part', part);
+                    console.log('part', part);
                     Qty = Qty + part.Qty;
+                    console.log(part.CGSTAmt, part.SGSTAmt, part.IGSTAmt);
                     CGSTAMT = CGSTAMT + part.CGSTAmt;
                     SGSTAMT = SGSTAMT + part.SGSTAmt;
                     IGSTAMT = IGSTAMT + part.IGSTAmt;
                     Taxable = Taxable + part.AfterPartDisc;
                     FinalTotal = FinalTotal + part.AfterPartTax;
                 });
+                console.log(CGSTAMT, SGSTAMT, IGSTAMT);
                 let dpartadding1 = {};
                 dpartadding1.SNo = '';
                 dpartadding1.Desc = 'Spare Total';

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

@@ -5,6 +5,7 @@ exports.getAvailablePageWidth = getAvailablePageWidth;
 exports.calculateSectionTotals = calculateSectionTotals;
 exports.readNumericValue = readNumericValue;
 exports.formatAmount = formatAmount;
+const math_operations_1 = require("../math-operations");
 const pdf_table_config_1 = require("./pdf-table.config");
 const pdf_table_header_1 = require("./pdf-table.header");
 const pdf_table_row_1 = require("./pdf-table.row");
@@ -89,8 +90,10 @@ function getAvailablePageWidth(pageSize, orientation, margins) {
 function calculateSectionTotals(rows) {
     return rows.reduce((acc, row) => {
         const sign = (row === null || row === void 0 ? void 0 : row.Ret) ? -1 : 1;
-        acc.qty += sign * readNumericValue(row, ['Qty']);
-        acc.priceTotal += sign * readNumericValue(row, ['UnPr', 'Pr', 'UnCo']);
+        const quantity = (row === null || row === void 0 ? void 0 : row.Qty) == null ? 1 : readNumericValue(row, ['Qty']);
+        acc.qty += sign * quantity;
+        const taxableAmt = Number((0, math_operations_1.Multiply)(quantity, readNumericValue(row, ['UnPr', 'Pr', 'UnCo'])));
+        acc.priceTotal += sign * (Number.isFinite(taxableAmt) ? taxableAmt : 0);
         acc.discountAmount += sign * readNumericValue(row, ['Disc']);
         acc.cgstAmount += sign * readNumericValue(row, ['CGSTAmt', 'CGST']);
         acc.sgstAmount += sign * readNumericValue(row, ['SGSTAmt', 'SGST']);

package/package.json

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