shareneus 1.4.24 → 1.4.25

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 (4) hide show
  1. package/dist/services/invoice-landscape-pdf.service.js +3 -3
  2. package/dist/services/invoice-portrait-pdf.js +4 -4
  3. package/dist/services/shared-pdf.service.js +3 -3
  4. package/package.json +1 -1
package/dist/services/invoice-landscape-pdf.service.js CHANGED
@@ -875,12 +875,12 @@ class InvoiceLandscapePdfService {
875
875
  let totalDisc;
876
876
  let totalTax;
877
877
  if (!ROPrintData.Consolidate) {
878
- totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartITax));
878
+ totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
879
879
  if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
880
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal));
880
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
881
881
  }
882
882
  else {
883
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal) + Number(ROPrintData.FixedDisc));
883
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
884
884
  }
885
885
  }
886
886
  return [
package/dist/services/invoice-portrait-pdf.js CHANGED
@@ -583,12 +583,12 @@ class InvoicePortraitPrintService {
583
583
  let totalDisc;
584
584
  let totalTax;
585
585
  if (!ROPrintData.Consolidate) {
586
- totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartITax));
586
+ totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
587
587
  if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
588
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal));
588
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
589
589
  }
590
590
  else {
591
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(0) + Number(ROPrintData.CustPartsDiscTotal) + Number(ROPrintData.FixedDisc));
591
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
592
592
  }
593
593
  }
594
594
  return [
@@ -622,7 +622,7 @@ class InvoicePortraitPrintService {
622
622
  }
623
623
  static GrandTotal(LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal) {
624
624
  let AccountFields = [
625
- { name: 'Total Disc.', value: OverAllRecordDiscount },
625
+ { name: 'Discount', value: OverAllRecordDiscount },
626
626
  ];
627
627
  if (!Consolidate && !tr_utils_1.TrUtils.IsNull(subTotal)) {
628
628
  AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal))) });
package/dist/services/shared-pdf.service.js CHANGED
@@ -1579,7 +1579,7 @@ class SharedPDFService {
1579
1579
  totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
1580
1580
  }
1581
1581
  else {
1582
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
1582
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
1583
1583
  }
1584
1584
  }
1585
1585
  let serviceName;
@@ -1694,7 +1694,7 @@ class SharedPDFService {
1694
1694
  totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
1695
1695
  }
1696
1696
  else {
1697
- totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
1697
+ totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
1698
1698
  }
1699
1699
  }
1700
1700
  return {
@@ -1913,7 +1913,7 @@ class SharedPDFService {
1913
1913
  let AccountFields = [
1914
1914
  // { name: 'Labor Total', value: LaborAfterGST },
1915
1915
  // { name: 'Part Total', value: PartsAfterGST },
1916
- { name: 'Total Disc.', value: OverAllRecordDiscount },
1916
+ { name: 'Discount', value: OverAllRecordDiscount },
1917
1917
  ];
1918
1918
  if (!Consolidate && !tr_utils_1.TrUtils.IsNull(subTotal)) {
1919
1919
  AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal))) });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.4.24",
3
+ "version": "1.4.25",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",