shareneus 1.4.9 → 1.4.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -49,7 +49,7 @@ class InvoiceTotalsService {
|
|
|
49
49
|
Operation.AfterLaborTax = (0, aggregation_1.addition)(Operation.AfterLaborDisc, Operation.CGST, Operation.SGST, Operation.IGST);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
Operation.AfterLaborDisc = (0, aggregation_1.subtraction)(Operation.Amt, Operation.Disc);
|
|
52
|
+
Operation.AfterLaborDisc = (0, aggregation_1.subtraction)(Operation.Amt, Operation.Disc, Operation.RecDisc);
|
|
53
53
|
Operation.AfterLaborTax = Operation.AfterLaborDisc;
|
|
54
54
|
}
|
|
55
55
|
});
|
|
@@ -81,7 +81,7 @@ class InvoiceTotalsService {
|
|
|
81
81
|
Part.AfterPartTax = (0, aggregation_1.addition)(Part.AfterPartDisc, Part.CGST, Part.SGST, Part.IGST);
|
|
82
82
|
}
|
|
83
83
|
else {
|
|
84
|
-
Part.AfterPartDisc = (0, aggregation_1.subtraction)(Part.UnAmt, Part.Disc);
|
|
84
|
+
Part.AfterPartDisc = (0, aggregation_1.subtraction)(Part.UnAmt, Part.Disc, Part.RecDisc);
|
|
85
85
|
Part.AfterPartTax = Part.AfterPartDisc;
|
|
86
86
|
}
|
|
87
87
|
});
|
|
@@ -147,7 +147,6 @@ class InvoiceTotalsService {
|
|
|
147
147
|
let CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList, IsIndependentTax, finalTotalsData);
|
|
148
148
|
let CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(LaborList);
|
|
149
149
|
let CustPartsTotalAfterDisc = this.GetPartsTotalAfterDiscount(PartsList);
|
|
150
|
-
console.log(CustLaborDiscTotal, CustPartsDiscTotal, CustLaborTotalAfterDisc, CustPartsTotalAfterDisc);
|
|
151
150
|
// if (IsIndependentTax) {
|
|
152
151
|
finalTotalsData.STotal = (0, aggregation_1.addition)(CustLaborDiscTotal, CustPartsDiscTotal, CustLaborTotalAfterDisc, CustPartsTotalAfterDisc);
|
|
153
152
|
// } else {
|