shareneus 1.6.58 → 1.6.60

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,7 +192,7 @@ class IssuePartsprintService {
                 let Taxable = 0;
                 let FinalTotal = 0;
                 Parts.forEach((part) => {
-                    // console.log('part', part);
+                    console.log('part', part);
                     Qty = Qty + part.Qty;
                     CGSTAMT = CGSTAMT + part.CGSTAmt;
                     SGSTAMT = SGSTAMT + part.SGSTAmt;

package/dist/services/ro-totals.service.d.ts

@@ -59,7 +59,7 @@ export declare class ROTotalsService {
     static GetInsParts(PartsList: any): any[];
     static GetInsTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetInsTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: number): any[];
-    static GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
+    static GetGSTValueBasedOnTaxCode(item: any, TaxCodes: any): any[];
     static GetCombinedTaxPercentage(Parts: any, TaxCodes: any): any;
     static ResetPartsHSNIfInvalid(Parts: any): any;
     static ComparePartsByHSN(Parts: any, TaxCodes: any): any[];

package/dist/services/ro-totals.service.js

@@ -1115,7 +1115,7 @@ class ROTotalsService {
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.PartsCount = MatchedPart.length;
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0], TaxCodes);
             TaxInfo.CGST = GSTValues[0];
             TaxInfo.SGST = GSTValues[1];
             TaxInfo.IGST = GSTValues[2];
@@ -1168,7 +1168,7 @@ class ROTotalsService {
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.PartsCount = MatchedPart.length;
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0], TaxCodes);
             TaxInfo.CGST = GSTValues[0];
             TaxInfo.SGST = GSTValues[1];
             TaxInfo.IGST = GSTValues[2];
@@ -1178,10 +1178,30 @@ class ROTotalsService {
         });
         return HSNTaxInfo;
     }
-    static GetGSTValueBasedOnTaxCode(TCode, TaxCodes) {
+    static GetGSTValueBasedOnTaxCode(item, TaxCodes) {
         let CGST = 0;
         let SGST = 0;
         let IGST = 0;
+        const taxGroupKeys = ['Taxes', 'CTaxes', 'ATaxes', 'ETaxes'];
+        for (const taxGroupKey of taxGroupKeys) {
+            const groupedTaxes = item === null || item === void 0 ? void 0 : item[taxGroupKey];
+            if (!Array.isArray(groupedTaxes) || groupedTaxes.length === 0) {
+                continue;
+            }
+            CGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'CGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            SGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'SGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            IGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'IGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            if (!tr_utils_1.TrUtils.IsZero((0, math_operations_1.Add)(CGST, SGST, IGST))) {
+                return [CGST, SGST, IGST];
+            }
+        }
+        const TCode = item === null || item === void 0 ? void 0 : item.TCode;
         if (tr_utils_1.TrUtils.IsNull(TCode)) {
             return [CGST, SGST, IGST];
         }
@@ -1202,7 +1222,7 @@ class ROTotalsService {
     }
     static GetCombinedTaxPercentage(Parts, TaxCodes) {
         Parts.forEach((Part) => {
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(Part, TaxCodes);
             let CGST = GSTValues[0];
             let SGST = GSTValues[1];
             let IGST = GSTValues[2];
@@ -1231,11 +1251,11 @@ class ROTotalsService {
                         PartFound = true;
                     }
                 });
-                let argGSTValues = this.GetGSTValueBasedOnTaxCode(argPart.TCode, TaxCodes);
+                let argGSTValues = this.GetGSTValueBasedOnTaxCode(argPart, TaxCodes);
                 let argCGST = argGSTValues[0];
                 let argSGST = argGSTValues[1];
                 let argIGST = argGSTValues[2];
-                let partGSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+                let partGSTValues = this.GetGSTValueBasedOnTaxCode(Part, TaxCodes);
                 let partCGST = partGSTValues[0];
                 let partSGST = partGSTValues[1];
                 let partIGST = partGSTValues[2];

package/package.json

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