shareneus 1.6.57 → 1.6.59

package/dist/accounting/credit-note/cn-print.service.d.ts

@@ -4,6 +4,9 @@ export declare class CNPrintService {
     static GetInvoiceTypeHeading(InvoicePrintData: any, OriginalInvoiceData: any, IncludeGST: boolean, ConsolidateGST: boolean, IsProforma: boolean): any;
     static GetInvoiceOtherDetailsForPrint(InvoicePrintData: any, OriginalInvoiceData: any): any;
     static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number): any;
+    static GetTaxAmountFromTaxes(item: any, taxCode: string, fallbackAmount?: any): any;
+    static GetTaxRateFromTaxes(item: any, taxCode: string, fallbackRate?: any): any;
+    static GetTCodeFromTaxes(item: any): any;
     static ReverseItemsForInvoicePrint(argInvoiceData: any): any;
     static PrepareFormatForInvoicePrint(InvoicePrintData: any, ROType: any, InvoiceStatus: any): any[];
     static GetFormattedProductDataForPrint(OriginalInvoiceData: any, InvoicePrintData: any): any;

package/dist/accounting/credit-note/cn-print.service.js

@@ -66,22 +66,26 @@ class CNPrintService {
     }
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
+            Item.TCode = this.GetTCodeFromTaxes(Item);
+            const cgstAmount = this.GetTaxAmountFromTaxes(Item, 'CGST', Item.CGST);
+            const sgstAmount = this.GetTaxAmountFromTaxes(Item, 'SGST', Item.SGST);
+            const igstAmount = this.GetTaxAmountFromTaxes(Item, 'IGST', Item.IGST);
             if (Consolidate) {
                 let AfterDiscForEach = (0, math_operations_1.Divide)(Item.AfterPartDisc, Item.Qty);
-                let CTaxAmtPerItem = (0, math_operations_1.Divide)(Item.CGST, Item.Qty);
-                let STaxAmtPerItem = (0, math_operations_1.Divide)(Item.SGST, Item.Qty);
-                let ITaxAmtPerItem = (0, math_operations_1.Divide)(Item.IGST, Item.Qty);
+                let CTaxAmtPerItem = (0, math_operations_1.Divide)(cgstAmount, Item.Qty);
+                let STaxAmtPerItem = (0, math_operations_1.Divide)(sgstAmount, Item.Qty);
+                let ITaxAmtPerItem = (0, math_operations_1.Divide)(igstAmount, Item.Qty);
                 Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             }
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
             }
-            Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST, DecimalsNumber);
-            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST, DecimalsNumber);
-            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST, DecimalsNumber);
-            Item.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            Item.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(cgstAmount, DecimalsNumber);
+            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(sgstAmount, DecimalsNumber);
+            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(igstAmount, DecimalsNumber);
+            Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST', shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
+            Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST', shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
+            Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST', shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
             if (LineTotal === 'AT') {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             }
@@ -94,6 +98,30 @@ class CNPrintService {
         });
         return Items;
     }
+    static GetTaxAmountFromTaxes(item, taxCode, fallbackAmount = 0) {
+        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 tr_utils_1.TrUtils.SetValueToZeroIfNull(fallbackAmount);
+    }
+    static GetTaxRateFromTaxes(item, taxCode, fallbackRate = 0) {
+        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 tr_utils_1.TrUtils.SetValueToZeroIfNull(fallbackRate);
+    }
+    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 ReverseItemsForInvoicePrint(argInvoiceData) {
         // argInvoiceData.Ops = argInvoiceData.Ops.reverse();
         argInvoiceData.Items = argInvoiceData.Items.reverse();

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

@@ -1,3 +1,4 @@
 export declare function GetInvoicePDF(invoiceData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], withPass?: boolean, options?: any): any;
+export declare function GetCreditNotePDF(creditNoteData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], options?: any): any;
 export declare function GetSalesReceiptPDF(salesReceiptData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], withPass?: boolean, options?: any): any;
 export declare function GetBillPDF(billData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any): any;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetInvoicePDF = GetInvoicePDF;
+exports.GetCreditNotePDF = GetCreditNotePDF;
 exports.GetSalesReceiptPDF = GetSalesReceiptPDF;
 exports.GetBillPDF = GetBillPDF;
 const purchase_order_print_service_1 = require("../../purchases/purchase-order/purchase-order-print.service");
@@ -8,6 +9,8 @@ const math_operations_1 = require("../../shared/math-operations");
 const tr_utils_1 = require("../../utils/tr-utils");
 const pos_receipt_pdf_1 = require("../counter-sales/pos-receipt-pdf");
 const sales_receipt_print_service_1 = require("../counter-sales/sales-receipt-print.service");
+const cn_print_service_1 = require("../credit-note/cn-print.service");
+const credit_note_pdf_service_1 = require("../credit-note/credit-note-pdf.service");
 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");
@@ -42,6 +45,28 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
     }
     return invPrint;
 }
+function GetCreditNotePDF(creditNoteData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], options = null) {
+    var _a;
+    if (!options) {
+        options = {
+            ShowGST: (((_a = creditNoteData === null || creditNoteData === void 0 ? void 0 : creditNoteData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) === 'TI') ? true : false,
+            ConsolidateGST: false,
+            Size: 'full',
+            MoreDiscDetails: false,
+            Orientation: 'portrait'
+        };
+    }
+    const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
+    const creditNotePrintData = cn_print_service_1.CNPrintService.GetCreditNotePrintInfo(creditNoteData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, false);
+    let cnPrint;
+    if (options.ConsolidateGST || !options.ShowGST) {
+        cnPrint = credit_note_pdf_service_1.CreditNotePdfService.GetInvoicePrint(creditNotePrintData, null, false);
+    }
+    else {
+        cnPrint = (0, invoice_pdf_service_1.CreateInvoicePDFService)(creditNotePrintData, printConfigData, numberofCopies);
+    }
+    return cnPrint;
+}
 function GetSalesReceiptPDF(salesReceiptData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
     var _a;
     if (!options) {

package/dist/services/ro-totals.service.d.ts

@@ -59,7 +59,7 @@ export declare class ROTotalsService {
     static GetInsParts(PartsList: any): any[];
     static GetInsTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetInsTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: number): any[];
-    static GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
+    static GetGSTValueBasedOnTaxCode(item: any, TaxCodes: any): any[];
     static GetCombinedTaxPercentage(Parts: any, TaxCodes: any): any;
     static ResetPartsHSNIfInvalid(Parts: any): any;
     static ComparePartsByHSN(Parts: any, TaxCodes: any): any[];

package/dist/services/ro-totals.service.js

@@ -1115,7 +1115,7 @@ class ROTotalsService {
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.PartsCount = MatchedPart.length;
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0], TaxCodes);
             TaxInfo.CGST = GSTValues[0];
             TaxInfo.SGST = GSTValues[1];
             TaxInfo.IGST = GSTValues[2];
@@ -1168,7 +1168,7 @@ class ROTotalsService {
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
             TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.PartsCount = MatchedPart.length;
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0], TaxCodes);
             TaxInfo.CGST = GSTValues[0];
             TaxInfo.SGST = GSTValues[1];
             TaxInfo.IGST = GSTValues[2];
@@ -1178,10 +1178,30 @@ class ROTotalsService {
         });
         return HSNTaxInfo;
     }
-    static GetGSTValueBasedOnTaxCode(TCode, TaxCodes) {
+    static GetGSTValueBasedOnTaxCode(item, TaxCodes) {
         let CGST = 0;
         let SGST = 0;
         let IGST = 0;
+        const taxGroupKeys = ['Taxes', 'CTaxes', 'ATaxes', 'ETaxes'];
+        for (const taxGroupKey of taxGroupKeys) {
+            const groupedTaxes = item === null || item === void 0 ? void 0 : item[taxGroupKey];
+            if (!Array.isArray(groupedTaxes) || groupedTaxes.length === 0) {
+                continue;
+            }
+            CGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'CGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            SGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'SGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            IGST = groupedTaxes
+                .filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === 'IGST')
+                .reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+            if (!tr_utils_1.TrUtils.IsZero((0, math_operations_1.Add)(CGST, SGST, IGST))) {
+                return [CGST, SGST, IGST];
+            }
+        }
+        const TCode = item === null || item === void 0 ? void 0 : item.TCode;
         if (tr_utils_1.TrUtils.IsNull(TCode)) {
             return [CGST, SGST, IGST];
         }
@@ -1202,7 +1222,7 @@ class ROTotalsService {
     }
     static GetCombinedTaxPercentage(Parts, TaxCodes) {
         Parts.forEach((Part) => {
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(Part, TaxCodes);
             let CGST = GSTValues[0];
             let SGST = GSTValues[1];
             let IGST = GSTValues[2];
@@ -1231,11 +1251,11 @@ class ROTotalsService {
                         PartFound = true;
                     }
                 });
-                let argGSTValues = this.GetGSTValueBasedOnTaxCode(argPart.TCode, TaxCodes);
+                let argGSTValues = this.GetGSTValueBasedOnTaxCode(argPart, TaxCodes);
                 let argCGST = argGSTValues[0];
                 let argSGST = argGSTValues[1];
                 let argIGST = argGSTValues[2];
-                let partGSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+                let partGSTValues = this.GetGSTValueBasedOnTaxCode(Part, TaxCodes);
                 let partCGST = partGSTValues[0];
                 let partSGST = partGSTValues[1];
                 let partIGST = partGSTValues[2];

package/package.json

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