shareneus 1.4.8 → 1.4.10

package/dist/services/invoice-total.service.js

@@ -49,7 +49,7 @@ class InvoiceTotalsService {
                 Operation.AfterLaborTax = (0, aggregation_1.addition)(Operation.AfterLaborDisc, Operation.CGST, Operation.SGST, Operation.IGST);
             }
             else {
-                Operation.AfterLaborDisc = (0, aggregation_1.subtraction)(Operation.Amt, Operation.Disc);
+                Operation.AfterLaborDisc = (0, aggregation_1.subtraction)(Operation.Amt, Operation.Disc, Operation.RecDisc);
                 Operation.AfterLaborTax = Operation.AfterLaborDisc;
             }
         });
@@ -81,7 +81,7 @@ class InvoiceTotalsService {
                 Part.AfterPartTax = (0, aggregation_1.addition)(Part.AfterPartDisc, Part.CGST, Part.SGST, Part.IGST);
             }
             else {
-                Part.AfterPartDisc = (0, aggregation_1.subtraction)(Part.UnAmt, Part.Disc);
+                Part.AfterPartDisc = (0, aggregation_1.subtraction)(Part.UnAmt, Part.Disc, Part.RecDisc);
                 Part.AfterPartTax = Part.AfterPartDisc;
             }
         });
@@ -147,7 +147,6 @@ class InvoiceTotalsService {
         let CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList, IsIndependentTax, finalTotalsData);
         let CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(LaborList);
         let CustPartsTotalAfterDisc = this.GetPartsTotalAfterDiscount(PartsList);
-        console.log(CustLaborDiscTotal, CustPartsDiscTotal, CustLaborTotalAfterDisc, CustPartsTotalAfterDisc);
         // if (IsIndependentTax) {
         finalTotalsData.STotal = (0, aggregation_1.addition)(CustLaborDiscTotal, CustPartsDiscTotal, CustLaborTotalAfterDisc, CustPartsTotalAfterDisc);
         // } else {
@@ -375,33 +374,31 @@ class InvoiceTotalsService {
     static GetLaborDiscountedTotal(LaborList, isTaxable, finalTotalsData) {
         let LaborDiscountedTotal = 0;
         let overallLaborDisc = 0;
-        if (!isTaxable) {
-            overallLaborDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(finalTotalsData.LDisc);
-        }
-        else {
-            LaborList.forEach((Labor) => {
-                LaborDiscountedTotal = (0, aggregation_1.addition)(LaborDiscountedTotal, Labor.DiscountedPrice);
-            });
-        }
+        // if (!isTaxable) {
+        //     overallLaborDisc = TrUtils.SetValueToZeroIfNull(finalTotalsData.LDisc)
+        // } else {
+        LaborList.forEach((Labor) => {
+            LaborDiscountedTotal = (0, aggregation_1.addition)(LaborDiscountedTotal, Labor.DiscountedPrice);
+        });
+        // }
         return (0, aggregation_1.addition)(LaborDiscountedTotal, overallLaborDisc);
     }
     static GetPartDiscountedTotal(PartsList, isTaxable, finalTotalsData) {
         let PartsDiscountedTotal = 0;
         let RetPartsDiscountedTotal = 0;
         let overallPartDisc = 0;
-        if (!isTaxable) {
-            overallPartDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(finalTotalsData.PDisc);
-        }
-        else {
-            PartsList.forEach((Part) => {
-                if (Part.Ret === true) {
-                    RetPartsDiscountedTotal = (0, aggregation_1.addition)(RetPartsDiscountedTotal, Part.DiscountedPrice);
-                }
-                else {
-                    PartsDiscountedTotal = (0, aggregation_1.addition)(PartsDiscountedTotal, Part.DiscountedPrice);
-                }
-            });
-        }
+        // if (!isTaxable) {
+        //     overallPartDisc = TrUtils.SetValueToZeroIfNull(finalTotalsData.PDisc)
+        // } else {
+        PartsList.forEach((Part) => {
+            if (Part.Ret === true) {
+                RetPartsDiscountedTotal = (0, aggregation_1.addition)(RetPartsDiscountedTotal, Part.DiscountedPrice);
+            }
+            else {
+                PartsDiscountedTotal = (0, aggregation_1.addition)(PartsDiscountedTotal, Part.DiscountedPrice);
+            }
+        });
+        // }
         return (0, aggregation_1.addition)((0, aggregation_1.subtraction)(PartsDiscountedTotal, RetPartsDiscountedTotal), overallPartDisc);
     }
     static GetLaborTaxTotalFor(opCodesList, IsIndependentTax) {

package/package.json

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