shareneus 1.6.69 → 1.6.70

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

@@ -1,4 +1,5 @@
 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 GetSalesOrderPDF(salesOrderData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], 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,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetInvoicePDF = GetInvoicePDF;
+exports.GetSalesOrderPDF = GetSalesOrderPDF;
 exports.GetCreditNotePDF = GetCreditNotePDF;
 exports.GetSalesReceiptPDF = GetSalesReceiptPDF;
 exports.GetBillPDF = GetBillPDF;
 const purchase_order_print_service_1 = require("../../purchases/purchase-order/purchase-order-print.service");
+const sales_pdf_service_1 = require("../../sales/sales/sales-pdf.service");
+const sales_print_service_1 = require("../../sales/sales/sales-print.service");
 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");
@@ -45,6 +48,30 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
     }
     return invPrint;
 }
+function GetSalesOrderPDF(salesOrderData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], options = null) {
+    var _a;
+    if (!options) {
+        options = {
+            ShowGST: (((_a = salesOrderData === null || salesOrderData === void 0 ? void 0 : salesOrderData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) === 'TI') ? true : false,
+            ConsolidateGST: false,
+            Size: 'full',
+            isOtherIndustry: false,
+            Design: false,
+            MoreDiscDetails: false,
+            Orientation: 'portrait'
+        };
+    }
+    const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
+    const soPrintData = sales_print_service_1.SalesPrintService.GetSalesPrintInfo(salesOrderData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, false, options.isOtherIndustry);
+    let soPrint;
+    if (options.ConsolidateGST || !options.ShowGST) {
+        soPrint = sales_pdf_service_1.SalesPdfService.GetSalesPrint(salesOrderData, numberofCopies, options.isOtherIndustry, entityData, options.Design, options.SoItems, image, options.MoreDiscDetails);
+    }
+    else {
+        soPrint = (0, invoice_pdf_service_1.CreateInvoicePDFService)(soPrintData, printConfigData, numberofCopies);
+    }
+    return soPrint;
+}
 function GetCreditNotePDF(creditNoteData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], options = null) {
     var _a;
     if (!options) {

package/dist/sales/delivery-challan/delivery-challan-print.service.d.ts

@@ -4,6 +4,9 @@ export declare class DeliveryChallanPrintService {
     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 GetBillNameForInvoicePrint(OriginalInvoiceData: any, InvoicePrintData: any): any;

package/dist/sales/delivery-challan/delivery-challan-print.service.js

@@ -78,22 +78,26 @@ class DeliveryChallanPrintService {
     }
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
+            const cgst = this.GetTaxAmountFromTaxes(Item, 'CGST');
+            const sgst = this.GetTaxAmountFromTaxes(Item, 'SGST');
+            const igst = this.GetTaxAmountFromTaxes(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)(cgst, Item.Qty);
+                let STaxAmtPerItem = (0, math_operations_1.Divide)(sgst, Item.Qty);
+                let ITaxAmtPerItem = (0, math_operations_1.Divide)(igst, Item.Qty);
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue((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(cgst, DecimalsNumber);
+            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(sgst, DecimalsNumber);
+            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(igst, DecimalsNumber);
+            Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST');
+            Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST');
+            Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST');
+            Item.TCode = this.GetTCodeFromTaxes(Item);
             if (LineTotal === 'AT') {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             }
@@ -106,6 +110,30 @@ class DeliveryChallanPrintService {
         });
         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.Items = argInvoiceData.Items.reverse();
         return argInvoiceData;

package/dist/sales/delivery-challan/delivery-challan-totals.d.ts

@@ -25,5 +25,8 @@ export declare class DeliveryChallanTotalsService {
     static GetCombinedTaxPercentage(Parts: any, TaxCodes: any): any;
     static ComparePartsByHSN(Parts: any, TaxCodes: any): any[];
     static GetTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: any): 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 GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
 }

package/dist/sales/delivery-challan/delivery-challan-totals.js

@@ -45,9 +45,10 @@ class DeliveryChallanTotalsService {
         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 = this.GetTaxAmountFromTaxes(Part, 'CGST');
+        Part.SGST = this.GetTaxAmountFromTaxes(Part, 'SGST');
+        Part.IGST = this.GetTaxAmountFromTaxes(Part, 'IGST');
+        Part.TCode = this.GetTCodeFromTaxes(Part);
         return Part;
     }
     static GetFinalChallanDataForSave(PartsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, isRoundable, DecimalsNumber) {
@@ -283,10 +284,9 @@ class DeliveryChallanTotalsService {
             if (tr_utils_1.TrUtils.IsNull(Part.HSN)) {
                 Part.HSN = '';
             }
-            let GSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
-            Part.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[0]);
-            Part.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[1]);
-            Part.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[2]);
+            Part.CGSTAmt = this.GetTaxRateFromTaxes(Part, 'CGST');
+            Part.SGSTAmt = this.GetTaxRateFromTaxes(Part, 'SGST');
+            Part.IGSTAmt = this.GetTaxRateFromTaxes(Part, 'IGST');
             Part.CombinedTaxPercentage = (0, math_operations_1.Add)(Part.CGSTAmt, Part.SGSTAmt, Part.IGSTAmt);
         });
         return Parts;
@@ -362,6 +362,30 @@ class DeliveryChallanTotalsService {
         });
         return HSNTaxInfo;
     }
+    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 GetGSTValueBasedOnTaxCode(TCode, TaxCodes) {
         let CGST = 0;
         let SGST = 0;

package/package.json

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