shareneus 1.6.52 → 1.6.54

package/dist/accounting/invoice/invoice-pdf.service.js

@@ -12,9 +12,10 @@ const inv_print_service_1 = require("./inv-print.service");
 const invoice_pdf_service_1 = require("./invoice-pdf/invoice-pdf.service");
 const unified_invoice_pdf_service_1 = require("./unified-invoice-pdf.service");
 function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
+    var _a;
     if (!options) {
         options = {
-            ShowGST: true,
+            ShowGST: (((_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) === 'TI') ? true : false,
             ConsolidateGST: false,
             PartInvoice: true,
             LaborInvoice: true,
@@ -42,9 +43,10 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
     return invPrint;
 }
 function GetSalesReceiptPDF(salesReceiptData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
+    var _a;
     if (!options) {
         options = {
-            ShowGST: true,
+            ShowGST: (((_a = salesReceiptData === null || salesReceiptData === void 0 ? void 0 : salesReceiptData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) === 'TI') ? true : false,
             ConsolidateGST: false,
             PartInvoice: true,
             LaborInvoice: true,

package/dist/accounting/invoice/invoice-total.service.js

@@ -182,7 +182,7 @@ class InvoiceTotalsService {
         let CustPartsTotalAfterDisc1 = this.GetPartsAfterDiscount1(PartsList);
         let AmtAfterIndvidualItemDisc = (0, math_operations_1.Add)(CustLaborTotalAfterDisc1, CustPartsTotalAfterDisc1);
         finalTotalsData.SIndTotal = AmtAfterIndvidualItemDisc;
-        finalTotalsData.Disc = !tr_utils_1.TrUtils.IsEmpty(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
+        // finalTotalsData.Disc = !TrUtils.IsZero(finalTotalsData.Perc) ? TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustPartTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
         let RetCustTotal = this.GetRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, RetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);
         let NonRetCustTotal = this.GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, NonRetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);

package/dist/shared/shared-print.service.js

@@ -801,7 +801,7 @@ class PrintSharedService {
         }
         else {
             if (ShowDiscountColumn) {
-                return [25, 210, 40, 70, 40, 40, 70];
+                return [25, 210, 40, 75, 40, 40, 80];
             }
             else {
                 return [25, 308, 52, 65, 80];

package/dist/shared/totals-section/pdf-totals.section.js

@@ -4,6 +4,7 @@ exports.buildInvoiceTotalsAndNotesSection = buildInvoiceTotalsAndNotesSection;
 exports.buildSignatureSection = buildSignatureSection;
 const pdf_header_footer_section_1 = require("../header-footer-section/pdf-header-footer.section");
 const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
+const math_operations_1 = require("../math-operations");
 const pdf_table_section_1 = require("../table-section/pdf-table.section");
 function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintConfigData = {}) {
     var _a;
@@ -472,6 +473,8 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
     const itemsDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PDisc));
     const servicesDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LDisc));
     const overallDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Disc, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Discount, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.TotDisc));
+    const overalItemsDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)((invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CustPartsDiscTotal) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PartsDiscTotal)));
+    const overalServicesDiscount = parseNumber((0, pdf_shared_utils_1.firstValue)((invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CustLaborDiscTotal) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.ServiceDiscTotal)));
     const hasDetailedDiscSource = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PDisc) !== ''
         || (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.LDisc) !== ''
         || (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Disc, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Discount, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.TotDisc) !== '';
@@ -480,9 +483,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         : (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Disc', 'Discount', 'TotDisc']);
     const roundOff = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Round', 'RoundOff']);
     console.log('invoiceData', invoiceData);
-    console.log('TotalTax', invoiceData.TotalTax);
     const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax']);
-    console.log('taxFromInvoice', taxFromInvoice);
     const totalTaxValue = taxFromInvoice !== 0 ? taxFromInvoice : totalTax;
     const returnTotal = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.RetTotal);
     const finalTotalRaw = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.FinalTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Total, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.GrandTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.NetTotal);
@@ -507,7 +508,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
             { label: 'Overall Discount', amount: overallDiscount }
         ]
         : [
-            { label: 'Discount', amount: discount }
+            { label: 'Discount', amount: (0, math_operations_1.Add)(overalItemsDiscount, overalServicesDiscount) }
         ])
         .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0);
     const totalLines = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.6.52",
+  "version": "1.6.54",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",