shareneus 1.6.37 → 1.6.39

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

@@ -20,6 +20,7 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
     const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
     printConfigData.withPass = withPass;
     const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, false, options.PartInvoice, options.LaborInvoice);
+    console.log('invoicePrintData', invoicePrintData);
     let invPrint;
     if (options.ConsolidateGST || !options.ShowGST) {
         invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);

package/dist/accounting/invoice/invoice-total.service.d.ts

@@ -1,4 +1,7 @@
 export declare class InvoiceTotalsService {
+    static GetTaxAmountFromTaxes(item: any, taxCode: string): any;
+    static GetTaxRateFromTaxes(item: any, taxCode: string): any;
+    static GetTCodeFromTaxes(item: any): any;
     static GetTotalsValue(opCodesList: any, PartsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, LDisc: any, LPerc: string, PDisc: any, PPerc: string, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, Adjust: number, isRoundable: boolean, EntitySettings: any): any;
     static CalculateLaborValues(opCodesList: any, IsIndependentTax: boolean): any;
     static ResetLaborValues(opCodesList: any, IsIndependentTax: boolean): any;
@@ -37,7 +40,6 @@ export declare class InvoiceTotalsService {
     static GetLaborGSTTaxTotal(opCodesList: any, IsIndependentTax: boolean): number[];
     static GetPartGSTTaxTotal(PartsList: any, IsIndependentTax: boolean): number[];
     static GetTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any, DecimalsNumber: any): any[];
-    static GetTaxRateFromTaxes(item: any, taxCode: string): any;
     static GetCombinedTaxPercentage(Parts: any, TaxCodes: any): any;
     static ComparePartsByHSN(Parts: any, TaxCodes: any): any[];
     static GetTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: any): any[];

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

@@ -4,6 +4,30 @@ exports.InvoiceTotalsService = void 0;
 const math_operations_1 = require("../../shared/math-operations");
 const tr_utils_1 = require("../../utils/tr-utils");
 class InvoiceTotalsService {
+    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, PartsList, IsIndependentTax, DetailedInfo, LDisc, LPerc, PDisc, PPerc, Disc, Perc, TaxCodes, WithItems, Settings, Adjust, isRoundable, EntitySettings) {
         LPerc = tr_utils_1.TrUtils.SetPercToStringIfNull(LPerc);
         PPerc = tr_utils_1.TrUtils.SetPercToStringIfNull(PPerc);
@@ -59,9 +83,10 @@ class InvoiceTotalsService {
         Operation.Pr = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.Pr);
         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 CalculateLaborPartValues(PartsList, IsIndependentTax) {
@@ -91,9 +116,10 @@ class InvoiceTotalsService {
         Part.UnPr = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.UnPr);
         Part.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.Disc);
         Part.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.RecDisc);
-        Part.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.CGST);
-        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(this.GetTaxAmountFromTaxes(Part, 'CGST') || 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.TCode = this.GetTCodeFromTaxes(Part);
         return Part;
     }
     static GetFinalRODataForSave(LaborList, PartsList, IsIndependentTax, LDisc, LPerc, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, Adjust, isRoundable, DecimalsNumber) {
@@ -328,10 +354,9 @@ class InvoiceTotalsService {
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.ItemsCount = MatchedLabor.length;
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedLabor[0].TCode, TaxCodes);
-            TaxInfo.CGST = GSTValues[0];
-            TaxInfo.SGST = GSTValues[1];
-            TaxInfo.IGST = GSTValues[2];
+            TaxInfo.CGST = this.GetTaxRateFromTaxes(MatchedLabor[0], 'CGST');
+            TaxInfo.SGST = this.GetTaxRateFromTaxes(MatchedLabor[0], 'SGST');
+            TaxInfo.IGST = this.GetTaxRateFromTaxes(MatchedLabor[0], 'IGST');
             if (TaxOnAmount !== 0) {
                 SACTaxInfo.push(TaxInfo);
             }
@@ -574,14 +599,6 @@ class InvoiceTotalsService {
         let FinalMatchedParts = this.ComparePartsByHSN(Parts, TaxCodes);
         return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber);
     }
-    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 GetCombinedTaxPercentage(Parts, TaxCodes) {
         Parts.forEach((Part) => {
             if (tr_utils_1.TrUtils.IsNull(Part.HSN)) {

package/package.json

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

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}