shareneus 1.5.3 → 1.5.5
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.
|
@@ -32,6 +32,7 @@ class SaleReceiptPrintService {
|
|
|
32
32
|
argInvoiceData.Ops = [];
|
|
33
33
|
}
|
|
34
34
|
let finalTotalsData = invoice_total_service_1.InvoiceTotalsService.GetTotalsValue(argInvoiceData.Ops, argInvoiceData.Items, IsTaxable, true, argInvoiceData.LDisc, argInvoiceData.LPerc, argInvoiceData.PDisc, argInvoiceData.PPerc, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, InvoicePrintData.Entity.Round, InvoicePrintData.Entity);
|
|
35
|
+
console.log('finalTotalsData', finalTotalsData);
|
|
35
36
|
if (ConsolidateGST) {
|
|
36
37
|
finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
|
|
37
38
|
finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
|
|
@@ -56,7 +57,7 @@ class SaleReceiptPrintService {
|
|
|
56
57
|
InvoicePrintData.Sts = PaymentData.Sts;
|
|
57
58
|
}
|
|
58
59
|
InvoicePrintData.Consolidate = ConsolidateGST;
|
|
59
|
-
InvoicePrintData.ShowDiscountColumn =
|
|
60
|
+
InvoicePrintData.ShowDiscountColumn = true;
|
|
60
61
|
if (!ForInsurance && !ConsolidateGST) {
|
|
61
62
|
if (shared_print_service_1.PrintSharedService.CheckItemIndexWithDisc(InvoicePrintData) !== -1) {
|
|
62
63
|
InvoicePrintData.ShowDiscountColumn = (InvoicePrintData.Settings.DiscLvl === 'ITM' || InvoicePrintData.Settings.DiscLvl === 'RECITM') ? true : false;
|
|
@@ -1991,6 +1991,9 @@ class SharedPDFService {
|
|
|
1991
1991
|
if (!Consolidate) {
|
|
1992
1992
|
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
|
|
1993
1993
|
}
|
|
1994
|
+
else {
|
|
1995
|
+
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber) });
|
|
1996
|
+
}
|
|
1994
1997
|
}
|
|
1995
1998
|
if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
|
|
1996
1999
|
AccountFields.push({ name: 'Total Tax', value: totalTax });
|