shareneus 1.6.53 → 1.6.54

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/accounting/invoice/invoice-total.service.js +1 -1
  2. package/dist/shared/shared-print.service.js +1 -1
  3. package/dist/shared/totals-section/pdf-totals.section.js +2 -1
  4. package/package.json +1 -1
package/dist/accounting/invoice/invoice-total.service.js CHANGED
@@ -182,7 +182,7 @@ class InvoiceTotalsService {
182
182
  let CustPartsTotalAfterDisc1 = this.GetPartsAfterDiscount1(PartsList);
183
183
  let AmtAfterIndvidualItemDisc = (0, math_operations_1.Add)(CustLaborTotalAfterDisc1, CustPartsTotalAfterDisc1);
184
184
  finalTotalsData.SIndTotal = AmtAfterIndvidualItemDisc;
185
- finalTotalsData.Disc = !tr_utils_1.TrUtils.IsZero(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
185
+ // finalTotalsData.Disc = !TrUtils.IsZero(finalTotalsData.Perc) ? TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
186
186
  let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustPartTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
187
187
  let RetCustTotal = this.GetRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, RetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);
188
188
  let NonRetCustTotal = this.GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, NonRetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);
package/dist/shared/shared-print.service.js CHANGED
@@ -801,7 +801,7 @@ class PrintSharedService {
801
801
  }
802
802
  else {
803
803
  if (ShowDiscountColumn) {
804
- return [25, 210, 40, 70, 40, 40, 70];
804
+ return [25, 210, 40, 75, 40, 40, 80];
805
805
  }
806
806
  else {
807
807
  return [25, 308, 52, 65, 80];
package/dist/shared/totals-section/pdf-totals.section.js CHANGED
@@ -4,6 +4,7 @@ exports.buildInvoiceTotalsAndNotesSection = buildInvoiceTotalsAndNotesSection;
4
4
  exports.buildSignatureSection = buildSignatureSection;
5
5
  const pdf_header_footer_section_1 = require("../header-footer-section/pdf-header-footer.section");
6
6
  const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
7
+ const math_operations_1 = require("../math-operations");
7
8
  const pdf_table_section_1 = require("../table-section/pdf-table.section");
8
9
  function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintConfigData = {}) {
9
10
  var _a;
@@ -507,7 +508,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
507
508
  { label: 'Overall Discount', amount: overallDiscount }
508
509
  ]
509
510
  : [
510
- { label: 'Discount', amount: overalItemsDiscount + overalServicesDiscount }
511
+ { label: 'Discount', amount: (0, math_operations_1.Add)(overalItemsDiscount, overalServicesDiscount) }
511
512
  ])
512
513
  .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0);
513
514
  const totalLines = [
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.6.53",
3
+ "version": "1.6.54",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",