shareneus 1.6.39 → 1.6.41

package/dist/accounting/counter-sales/sales-receipt-print.service.d.ts

@@ -1,4 +1,7 @@
 export declare class SaleReceiptPrintService {
+    static GetTaxAmountFromTaxes(item: any, taxCode: string): any;
+    static GetTaxRateFromTaxes(item: any, taxCode: string): any;
+    static GetTCodeFromTaxes(item: any): any;
     static GetSaleReceiptPrintInfo(OriginalInvoiceData: any, OriginalEntityData: any, image: any, IncludeGST: boolean, ConsolidateGST: boolean, TaxCodes: any, IsProforma: boolean, OBN: boolean): any;
     static GetPrintConditionsBasedOnInput(InvoicePrintData: any, IncludeGST: boolean, ConsolidateGST: boolean, ForInsurance: boolean, SType: any, OriginalInvoiceData: any, IsProforma: boolean): any;
     static GetInvoiceTypeHeading(InvoicePrintData: any, OriginalInvoiceData: any, IncludeGST: boolean, ConsolidateGST: boolean, IsProforma: boolean): any;

package/dist/accounting/counter-sales/sales-receipt-print.service.js

@@ -9,6 +9,30 @@ const my_date_1 = require("../../utils/my-date");
 const tr_utils_1 = require("../../utils/tr-utils");
 const invoice_total_service_1 = require("../invoice/invoice-total.service");
 class SaleReceiptPrintService {
+    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 GetSaleReceiptPrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, OBN) {
         var _a, _b, _c, _d;
         let ForInsurance = !tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo) && !tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId);
@@ -156,12 +180,13 @@ class SaleReceiptPrintService {
             else {
                 Labor.UnPr = tr_utils_1.TrUtils.FixPriceValue(Labor.Pr, DecimalsNumber);
             }
-            Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.CGST, DecimalsNumber);
-            Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.SGST, DecimalsNumber);
-            Labor.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.IGST, DecimalsNumber);
-            Labor.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
-            Labor.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
-            Labor.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
+            Labor.TCode = this.GetTCodeFromTaxes(Labor);
+            Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'CGST'), DecimalsNumber);
+            Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'SGST'), DecimalsNumber);
+            Labor.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'IGST'), DecimalsNumber);
+            Labor.CGSTPerc = this.GetTaxRateFromTaxes(Labor, 'CGST');
+            Labor.SGSTPerc = this.GetTaxRateFromTaxes(Labor, 'SGST');
+            Labor.IGSTPerc = this.GetTaxRateFromTaxes(Labor, 'IGST');
             if (LineTotal === 'AT') {
                 Labor.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Labor.AfterLaborTax, DecimalsNumber);
             }
@@ -174,11 +199,14 @@ class SaleReceiptPrintService {
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, OBN, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
             var _a;
+            const itemCGST = this.GetTaxAmountFromTaxes(Item, 'CGST');
+            const itemSGST = this.GetTaxAmountFromTaxes(Item, 'SGST');
+            const itemIGST = 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)(itemCGST, Item.Qty);
+                let STaxAmtPerItem = (0, math_operations_1.Divide)(itemSGST, Item.Qty);
+                let ITaxAmtPerItem = (0, math_operations_1.Divide)(itemIGST, Item.Qty);
                 let DiscPerItem = (0, math_operations_1.Divide)((0, math_operations_1.Add)(Item.Disc, Item.RecDisc), Item.Qty);
                 Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, DiscPerItem, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             }
@@ -187,7 +215,8 @@ class SaleReceiptPrintService {
             }
             Item.ExDt = this.GetExpiryDate(Item);
             Item.Batch = this.GetBatchesData(Item, OBN);
-            Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CGST, DecimalsNumber);
+            Item.TCode = this.GetTCodeFromTaxes(Item);
+            Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(itemCGST, DecimalsNumber);
             if (tr_utils_1.TrUtils.IsNull(Item.ConUt)) {
                 Item.ConUt = 1;
             }
@@ -195,12 +224,12 @@ class SaleReceiptPrintService {
                 Item.Make = (_a = Item.Make) === null || _a === void 0 ? void 0 : _a.slice(0, 4).toUpperCase();
             }
             Item.Qty = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Multiply)(Item.Qty, Item.ConUt), DecimalsNumber);
-            Item.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.SGST, DecimalsNumber);
-            Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(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.SGSTAmt = tr_utils_1.TrUtils.FixedTo(itemSGST, DecimalsNumber);
+            Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(itemIGST, DecimalsNumber);
+            Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST');
+            Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST');
             Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
-            Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST');
             if (Consolidate) {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Multiply)(Item.UnPr, Item.Qty), DecimalsNumber);
             }

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

@@ -20,7 +20,6 @@ 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/shared/totals-section/pdf-totals.section.js

@@ -467,7 +467,7 @@ function hasDisplayValue(value) {
     return true;
 }
 function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
-    const subtotal = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['STotal', 'SubTotal', 'SubTot', 'TaxableAmount', 'TaxableValue']);
+    const subtotal = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['SIndTotal', 'STotal', 'SubTotal', 'SubTot', 'TaxableAmount', 'TaxableValue']);
     const showDetailedDisc = isTruthy((0, pdf_shared_utils_1.firstValue)(printConfigData === null || printConfigData === void 0 ? void 0 : printConfigData.ShowDetailedDisc));
     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));
@@ -479,8 +479,12 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         ? itemsDiscount + servicesDiscount + overallDiscount
         : (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);
     const finalTotal = parseNumber(finalTotalRaw);
     let totalBeforeRound = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalBeforeRound', 'BeforeRoundTotal', 'PreRoundTotal']);
@@ -510,6 +514,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         { label: 'SubTotal', amount: subtotal },
         ...discountLines,
         { label: 'Total Tax', amount: totalTaxValue },
+        { label: 'Return Total', amount: returnTotal },
         { label: 'Total', amount: totalBeforeRound },
         { label: 'Rounding', amount: roundOff },
         { label: 'Final Total', amount: resolvedFinalTotal }

package/package.json

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