shareneus 1.6.51 → 1.6.53

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 = !tr_utils_1.TrUtils.IsZero(finalTotalsData.Perc) ? tr_utils_1.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/purchases/purchase-order/purchase-order-totals.service.d.ts

@@ -1,4 +1,7 @@
 export declare class PurchaseOrderTotalsService {
+    static GetTaxAmountFromTaxes(item: any, taxCode: string): any;
+    static GetTaxRateFromTaxes(item: any, taxCode: string): any;
+    static GetTCodeFromTaxes(item: any): any;
     static GetTotalsValue(opCodesList: any, argPartsList: any, IsTaxable: boolean, DetailedTotalsInfo: boolean, TaxCodes: any, Tax: any, ReturnPartsAlso: boolean, HasNoTax: boolean, GetSubTotal: boolean, Discount: number, DiscInPerc: boolean, Adjust: number, EntitySettings: any): any;
     static CalculateLaborValues(opCodesList: any, IsIndependentTax: boolean, DecimalsNumber: number): any;
     static ResetLaborValues(opCodesList: any, IsIndependentTax: boolean, DecimalsNumber: number): any;

package/dist/purchases/purchase-order/purchase-order-totals.service.js

@@ -5,6 +5,30 @@ const code_enums_1 = require("../../enums/code-enums");
 const math_operations_1 = require("../../shared/math-operations");
 const tr_utils_1 = require("../../utils/tr-utils");
 class PurchaseOrderTotalsService {
+    static GetTaxAmountFromTaxes(item, taxCode) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Amt), 0);
+        }
+        return 0;
+    }
+    static GetTaxRateFromTaxes(item, taxCode) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+        }
+        return 0;
+    }
+    static GetTCodeFromTaxes(item) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTax = taxes.find((tax) => !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId));
+        if (!tr_utils_1.TrUtils.IsNull(matchedTax === null || matchedTax === void 0 ? void 0 : matchedTax.TaxCodeId)) {
+            return matchedTax.TaxCodeId;
+        }
+        return item === null || item === void 0 ? void 0 : item.TCode;
+    }
     static GetTotalsValue(opCodesList, argPartsList, IsTaxable, DetailedTotalsInfo, TaxCodes, Tax, ReturnPartsAlso, HasNoTax, GetSubTotal, Discount, DiscInPerc, Adjust, EntitySettings) {
         let PartsList = tr_utils_1.TrUtils.IsNull(argPartsList) ? [] : tr_utils_1.TrUtils.Stringify(argPartsList);
         // PartsList = this.ResetPartValuesIfInvalid(PartsList);
@@ -65,9 +89,10 @@ class PurchaseOrderTotalsService {
         Operation.UnCo = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.UnCo);
         Operation.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.RecDisc);
         Operation.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.Disc);
-        Operation.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.CGST);
-        Operation.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.SGST);
-        Operation.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.IGST);
+        Operation.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Operation, 'CGST') || Operation.CGST);
+        Operation.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Operation, 'SGST') || Operation.SGST);
+        Operation.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Operation, 'IGST') || Operation.IGST);
+        Operation.TCode = this.GetTCodeFromTaxes(Operation);
         return Operation;
     }
     static CheckPartStatusAndReturn(PartsList) {
@@ -83,9 +108,10 @@ class PurchaseOrderTotalsService {
         }
         Part.UnCo = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.UnCo);
         Part.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.Disc);
-        Part.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.SGST);
-        Part.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.IGST);
-        Part.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.CGST);
+        Part.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Part, 'SGST') || Part.SGST);
+        Part.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Part, 'IGST') || Part.IGST);
+        Part.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxAmountFromTaxes(Part, 'CGST') || Part.CGST);
+        Part.TCode = this.GetTCodeFromTaxes(Part);
         // }
         return Part;
     }
@@ -241,9 +267,9 @@ class PurchaseOrderTotalsService {
         finalTotalsData.PartSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxAmt[1]);
         finalTotalsData.PartIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxAmt[2]);
         let ServiceTaxAmt = this.GetServicesGSTTaxTotal(LaborList);
-        finalTotalsData.ServieCGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxAmt[0]);
-        finalTotalsData.ServieSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxAmt[1]);
-        finalTotalsData.ServieIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxAmt[2]);
+        finalTotalsData.ServieCGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServiceTaxAmt[0]);
+        finalTotalsData.ServieSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServiceTaxAmt[1]);
+        finalTotalsData.ServieIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServiceTaxAmt[2]);
         finalTotalsData.PartAfterTax = (0, math_operations_1.Add)(finalTotalsData.PartsTotalAfterDisc, finalTotalsData.TaxTotal);
         finalTotalsData.ServiceAfterTax = (0, math_operations_1.Add)(finalTotalsData.ServiceTotalAfterDisc, finalTotalsData.ServiceTaxTotal);
         finalTotalsData.IsTaxable = IsTaxable;
@@ -434,13 +460,10 @@ class PurchaseOrderTotalsService {
             if (tr_utils_1.TrUtils.IsNull(Part.HSN)) {
                 Part.HSN = '';
             }
-            let TaxInfo = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
-            Part.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[0]);
-            Part.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
-            Part.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[2]);
-            // Part.CGSTAmt = this.GetCGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
-            // Part.SGSTAmt = this.GetSGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
-            // Part.IGSTAmt = this.GetIGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+            Part.TCode = this.GetTCodeFromTaxes(Part);
+            Part.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxRateFromTaxes(Part, 'CGST'));
+            Part.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxRateFromTaxes(Part, 'SGST'));
+            Part.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(this.GetTaxRateFromTaxes(Part, 'IGST'));
             Part.CombinedTaxPercentage = (0, math_operations_1.Add)(Part.CGSTAmt, Part.SGSTAmt, Part.IGSTAmt);
         });
         return Items;

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

@@ -472,6 +472,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 +482,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 +507,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
             { label: 'Overall Discount', amount: overallDiscount }
         ]
         : [
-            { label: 'Discount', amount: discount }
+            { label: 'Discount', amount: 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.51",
+  "version": "1.6.53",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",