shareneus 1.4.9 → 1.4.11

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.
Files changed (2) hide show
  1. package/dist/services/invoice-total.service.js +5 -6
  2. package/package.json +1 -1
package/dist/services/invoice-total.service.js CHANGED
@@ -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 {
@@ -455,7 +454,7 @@ class InvoiceTotalsService {
455
454
  return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount, Adjust);
456
455
  }
457
456
  else {
458
- return (0, aggregation_1.addition)((0, aggregation_1.subtraction)((0, aggregation_1.addition)((0, aggregation_1.subtraction)(LaborTotalAfterDisc, finalTotalsData.LDisc), (0, aggregation_1.subtraction)(PartsTotalAfterDisc, finalTotalsData.PDisc)), finalTotalsData.Disc), Adjust);
457
+ return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, Adjust);
459
458
  }
460
459
  }
461
460
  static GetRetCustomerTotalBasedOnTaxType(finalTotalsData, LaborTaxAmount, PartsTaxAmount, LaborList, PartsList, IsIndependentTax, Adjust) {
@@ -465,7 +464,7 @@ class InvoiceTotalsService {
465
464
  return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
466
465
  }
467
466
  else {
468
- return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)((0, aggregation_1.subtraction)(LaborTotalAfterDisc, finalTotalsData.LDisc), (0, aggregation_1.subtraction)(PartsTotalAfterDisc, finalTotalsData.PDisc)));
467
+ return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
469
468
  }
470
469
  }
471
470
  static GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, LaborTaxAmount, PartsTaxAmount, LaborList, PartsList, IsIndependentTax, Adjust) {
@@ -475,7 +474,7 @@ class InvoiceTotalsService {
475
474
  return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
476
475
  }
477
476
  else {
478
- return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)((0, aggregation_1.subtraction)(LaborTotalAfterDisc, finalTotalsData.LDisc), (0, aggregation_1.subtraction)(PartsTotalAfterDisc, finalTotalsData.PDisc)));
477
+ return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
479
478
  }
480
479
  }
481
480
  static LaborTotalAfterDiscount(LaborTotalAfterDisc, LaborTaxAmount, MainLDisc, LDiscInPerc) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.4.9",
3
+ "version": "1.4.11",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",