shareneus 1.4.15 → 1.4.17

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 (3) hide show
  1. package/dist/services/inv-print.service.js +10 -4
  2. package/dist/services/invoice-portrait-pdf.js +1 -1
  3. package/package.json +1 -1
package/dist/services/inv-print.service.js CHANGED
@@ -22,8 +22,8 @@ class InvPrintService {
22
22
  InvoicePrintData.IsProforma = IsProforma;
23
23
  InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
24
24
  let SType;
25
- if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.Settings) && !tr_utils_1.TrUtils.IsNull(argInvoiceData.Settings.PoS)) {
26
- SType = argInvoiceData.Settings.PoS.SType;
25
+ if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
26
+ SType = argInvoiceData.SType;
27
27
  }
28
28
  InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma, PartsPrint, LaborPrint);
29
29
  InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Invoice", OriginalInvoiceData);
@@ -212,9 +212,12 @@ class InvPrintService {
212
212
  }
213
213
  else {
214
214
  Labor.DiscPerc = Labor.Perc;
215
- if (!tr_utils_1.TrUtils.IsZero(Labor.UnPr)) {
215
+ if (!tr_utils_1.TrUtils.IsZero(Number(Labor.UnPr))) {
216
216
  Labor.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Labor.Disc), Labor.UnPr);
217
217
  }
218
+ else {
219
+ Labor.DiscPerc = 0;
220
+ }
218
221
  }
219
222
  Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.CGST);
220
223
  Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.SGST);
@@ -260,9 +263,12 @@ class InvPrintService {
260
263
  }
261
264
  else {
262
265
  Item.DiscPerc = Item.Perc;
263
- if (!tr_utils_1.TrUtils.IsZero(Item.UnPr)) {
266
+ if (!tr_utils_1.TrUtils.IsZero(Number(Item.UnPr))) {
264
267
  Item.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Item.Disc), Item.UnPr);
265
268
  }
269
+ else {
270
+ Item.DiscPerc = 0;
271
+ }
266
272
  }
267
273
  Item.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
268
274
  Item.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
package/dist/services/invoice-portrait-pdf.js CHANGED
@@ -36,7 +36,7 @@ class InvoicePortraitPrintService {
36
36
  },
37
37
  layout: this.HeaderLayOut()
38
38
  },
39
- this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.Settings.PoS.SType, printOptions, size),
39
+ this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.SType, printOptions, size),
40
40
  [this.TotalDetails(InvoicePDFData)],
41
41
  {
42
42
  style: 'tableExample',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.4.15",
3
+ "version": "1.4.17",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",