shareneus 1.4.99 → 1.5.1

package/dist/sales-receive/sales-receive-print.service.d.ts

@@ -3,7 +3,7 @@ export declare class SalesReceivePrintService {
     static GetPrintConditionsBasedOnInput(SalesReceivePrintData: any, IncludeGST: boolean, ConsolidateGST: boolean, ForInsurance: boolean, SType: any, OriginalSalesReceiveData: any, IsProforma: boolean): any;
     static GetSalesReceiveTypeHeading(SalesReceivePrintData: any, OriginalSalesReceiveData: any, IncludeGST: boolean, ConsolidateGST: boolean, IsProforma: boolean): any;
     static GetSalesReceiveOtherDetailsForPrint(SalesReceivePrintData: any, OriginalSalesReceiveData: any): any;
-    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number): any;
+    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, IsTaxable: boolean, DecimalsNumber: number): any;
     static ReverseItemsForSalesReceivePrint(argSalesReceiveData: any): any;
     static PrepareFormatForSalesReceivePrint(SalesReceivePrintData: any, ROType: any, InvoiceStatus: any): any[];
     static GetFormattedProductDataForPrint(OriginalSalesReceiveData: any, SalesReceivePrintData: any): any;

package/dist/sales-receive/sales-receive-print.service.js

@@ -4,7 +4,6 @@ exports.SalesReceivePrintService = void 0;
 const aggregation_1 = require("../aggregation/aggregation");
 const code_enums_1 = require("../enums/code-enums");
 const enums_1 = require("../enums/enums");
-const math_operations_1 = require("../shared/math-operations");
 const shared_print_service_1 = require("../shared/shared-print.service");
 const my_date_1 = require("../utils/my-date");
 const tr_utils_1 = require("../utils/tr-utils");
@@ -21,6 +20,7 @@ class SalesReceivePrintService {
         SalesReceivePrintData.IsProforma = IsProforma;
         SalesReceivePrintData.Settings = tr_utils_1.TrUtils.Stringify(argSalesReceiveData.Settings);
         SalesReceivePrintData.SType = tr_utils_1.TrUtils.Stringify(argSalesReceiveData.SType);
+        SalesReceivePrintData.Items = tr_utils_1.TrUtils.Stringify(argSalesReceiveData.Items);
         let SType = tr_utils_1.TrUtils.IsNull(argSalesReceiveData.SType) ? null : argSalesReceiveData.SType;
         SalesReceivePrintData = this.GetPrintConditionsBasedOnInput(SalesReceivePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argSalesReceiveData, IsProforma);
         SalesReceivePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Invoice", OriginalSalesReceiveData);
@@ -30,14 +30,14 @@ class SalesReceivePrintService {
         // let finalTotalsData: any = SalesReceiveTotalsService.GetTotalsValue([], argSalesReceiveData.Items, IsTaxable,
         //     true,
         //     argSalesReceiveData.Disc, argSalesReceiveData.Perc, TaxCodes, true, argSalesReceiveData.Settings, SalesReceivePrintData.Entity);
-        let finalTotalsData = (0, sales_total_calculation_1.SalesTotalCalculationsWithDecimals)(argSalesReceiveData.Items, [], IsTaxable, argSalesReceiveData.DecimalsNumber);
+        let finalTotalsData = (0, sales_total_calculation_1.SalesTotalCalculationsWithDecimals)(argSalesReceiveData.Items, [], IsTaxable, TaxCodes, argSalesReceiveData.DecimalsNumber);
         if (ConsolidateGST) {
             // finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             // finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
-            finalTotalsData.CustPartsTotalBeforeDisc = (0, math_operations_1.Add)(finalTotalsData.totalTaxOnItems, (0, math_operations_1.Subtract)(finalTotalsData.subtotalOnItems, finalTotalsData.totalDiscountOnItems));
+            finalTotalsData.CustPartsTotalBeforeDisc = (0, aggregation_1.addition)(finalTotalsData.totalTaxOnItems, (0, aggregation_1.subtraction)(finalTotalsData.subtotalOnItems, finalTotalsData.totalDiscountOnItems));
         }
         SalesReceivePrintData = tr_utils_1.TrUtils.ConcatObjects(SalesReceivePrintData, finalTotalsData);
-        SalesReceivePrintData.Items = this.GetItemsPrintInfo(SalesReceivePrintData.Items, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, SalesReceivePrintData.Entity.DecimalsNumber);
+        SalesReceivePrintData.Items = this.GetItemsPrintInfo(SalesReceivePrintData.Items, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, IsTaxable, SalesReceivePrintData.Entity.DecimalsNumber);
         argSalesReceiveData = this.ReverseItemsForSalesReceivePrint(argSalesReceiveData);
         SalesReceivePrintData.PrintInfo = this.PrepareFormatForSalesReceivePrint(SalesReceivePrintData, code_enums_1.ROTypeEnum.Invoice, argSalesReceiveData.Sts);
         SalesReceivePrintData = this.GetFormattedProductDataForPrint(argSalesReceiveData, SalesReceivePrintData);
@@ -69,10 +69,11 @@ class SalesReceivePrintService {
         SalesReceivePrintData.CrDate = my_date_1.MyDate.ConvertUTCDateToReadable(OriginalSalesReceiveData.CrDate);
         return SalesReceivePrintData;
     }
-    static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
+    static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, IsTaxable, DecimalsNumber) {
         Items.forEach((Item) => {
             if (Consolidate) {
-                let AfterDiscForEach = (0, aggregation_1.division)(Item.AfterPartDisc, Item.Qty);
+                let AfterPartDisc = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
+                let AfterDiscForEach = (0, aggregation_1.division)(AfterPartDisc, Item.Qty);
                 let CTaxAmtPerItem = (0, aggregation_1.division)(Item.CGST, Item.Qty);
                 let STaxAmtPerItem = (0, aggregation_1.division)(Item.SGST, Item.Qty);
                 let ITaxAmtPerItem = (0, aggregation_1.division)(Item.IGST, Item.Qty);
@@ -87,6 +88,13 @@ class SalesReceivePrintService {
             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);
+            // Calculate amount after tax based on tax type
+            if (IsTaxable) {
+                Item.AfterPartTax = (0, aggregation_1.addition)(Item.AfterPartDisc, Item.CGST, Item.SGST, Item.IGST);
+            }
+            else {
+                Item.AfterPartTax = Item.AfterPartDisc;
+            }
             if (LineTotal === 'AT') {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             }

package/dist/sales-receive/sales-total-calculation.d.ts

@@ -1,5 +1,6 @@
-export declare function SalesTotalCalculations(items?: any[], ops?: any[], isTaxable?: boolean): any;
+export declare function SalesTotalCalculations(items?: any[], ops?: any[], isTaxable?: boolean, taxCodes?: any[]): any;
 /**
  * Enhanced version with decimal places control
  */
-export declare function SalesTotalCalculationsWithDecimals(items?: any[], ops?: any[], isTaxable?: boolean, decimalPlaces?: number): any;
+export declare function SalesTotalCalculationsWithDecimals(items?: any[], ops?: any[], isTaxable?: boolean, taxCodes?: any[], decimalPlaces?: number): any;
+export declare function CalculateTaxSummary(items: any[], taxCodes: any[]): unknown[];

package/dist/sales-receive/sales-total-calculation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesTotalCalculations = SalesTotalCalculations;
 exports.SalesTotalCalculationsWithDecimals = SalesTotalCalculationsWithDecimals;
+exports.CalculateTaxSummary = CalculateTaxSummary;
 const math_operations_1 = require("../shared/math-operations");
 const util_1 = require("../shared/util");
 /**
@@ -10,10 +11,11 @@ const util_1 = require("../shared/util");
 function safeArray(arr) {
     return Array.isArray(arr) ? arr : [];
 }
-function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
+function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCodes = []) {
     // Handle null/undefined arrays
     const safeItems = safeArray(items);
     const safeOps = safeArray(ops);
+    const safeTaxCodes = safeArray(taxCodes);
     // Initialize all totals
     let total = 0;
     let subtotalOnItems = 0;
@@ -90,12 +92,11 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
     const netAmountAfterDiscount = (0, math_operations_1.Subtract)(subtotal, totalDiscount);
     // Step 2: Add tax if taxable
     total = isTaxable ? (0, math_operations_1.Add)(netAmountAfterDiscount, totalTax) : netAmountAfterDiscount;
-    totalAfterRounded = isTaxable ? (0, math_operations_1.Add)(netAmountAfterDiscount, totalTax) : netAmountAfterDiscount;
     // FIXED ROUNDING: Use Math.round instead of Math.floor
     const roundedTotal = Math.round(total);
     roundOff = (0, math_operations_1.Subtract)(roundedTotal, total);
     // Update total to rounded value
-    total = roundedTotal;
+    totalAfterRounded = roundedTotal;
     // Base return object
     const result = {
         total,
@@ -109,10 +110,9 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
         totalDiscountOnLabor,
         netAmountAfterDiscount
     };
-    // Only include tax fields if taxable
+    // Only include tax fields and taxSummary if taxable
     if (isTaxable) {
         result.totalTax = totalTax;
-        result.totalAfterRounded = totalAfterRounded;
         result.totalTaxOnItems = totalTaxOnItems;
         result.totalTaxOnLabor = totalTaxOnLabor;
         result.totalSGST = totalSGST;
@@ -124,14 +124,17 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
         result.totalSGSTOnLabor = totalSGSTOnLabor;
         result.totalCGSTOnLabor = totalCGSTOnLabor;
         result.totalIGSTOnLabor = totalIGSTOnLabor;
+        // Calculate tax summary only if taxable and taxCodes provided
+        result.itemsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(safeItems, safeTaxCodes) : [];
+        result.opsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(safeOps, safeTaxCodes) : [];
     }
     return result;
 }
 /**
  * Enhanced version with decimal places control
  */
-function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = false, decimalPlaces = 2) {
-    const result = SalesTotalCalculations(items, ops, isTaxable);
+function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = false, taxCodes = [], decimalPlaces = 2) {
+    const result = SalesTotalCalculations(items, ops, isTaxable, taxCodes);
     // Round all values to specified decimal places
     const roundToDecimals = (num) => Math.round(num * Math.pow(10, decimalPlaces)) / Math.pow(10, decimalPlaces);
     // Base rounded result
@@ -147,7 +150,7 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
         totalDiscountOnLabor: roundToDecimals(result.totalDiscountOnLabor),
         netAmountAfterDiscount: roundToDecimals(result.netAmountAfterDiscount)
     };
-    // Only include tax fields if taxable
+    // Only include tax fields and taxSummary if taxable
     if (isTaxable) {
         roundedResult.totalTax = roundToDecimals(result.totalTax);
         roundedResult.totalTaxOnItems = roundToDecimals(result.totalTaxOnItems);
@@ -161,6 +164,41 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
         roundedResult.totalSGSTOnLabor = roundToDecimals(result.totalSGSTOnLabor);
         roundedResult.totalCGSTOnLabor = roundToDecimals(result.totalCGSTOnLabor);
         roundedResult.totalIGSTOnLabor = roundToDecimals(result.totalIGSTOnLabor);
+        // Round tax summary only if it exists
+        if (result.itemsTaxSummary) {
+            roundedResult.itemsTaxSummary = result.itemsTaxSummary.map((tax) => (Object.assign(Object.assign({}, tax), { TaxableAmount: roundToDecimals(tax.TaxableAmount), TaxAmount: roundToDecimals(tax.TaxAmount), CGSTAmount: roundToDecimals(tax.CGSTAmount), SGSTAmount: roundToDecimals(tax.SGSTAmount), IGSTAmount: roundToDecimals(tax.IGSTAmount) })));
+        }
+        if (result.opsTaxSummary) {
+            roundedResult.opsTaxSummary = result.opsTaxSummary.map((tax) => (Object.assign(Object.assign({}, tax), { TaxableAmount: roundToDecimals(tax.TaxableAmount), TaxAmount: roundToDecimals(tax.TaxAmount), CGSTAmount: roundToDecimals(tax.CGSTAmount), SGSTAmount: roundToDecimals(tax.SGSTAmount), IGSTAmount: roundToDecimals(tax.IGSTAmount) })));
+        }
     }
     return roundedResult;
 }
+function CalculateTaxSummary(items, taxCodes) {
+    // Create lookup for tax codes
+    const taxMap = Object.fromEntries(taxCodes.map(tc => [tc._id, tc]));
+    return Object.values(items.reduce((acc, item) => {
+        const tax = taxMap[item.TCode];
+        if (!tax)
+            return acc;
+        const percent = (tax.IGST || (tax.CGST || 0) + (tax.SGST || 0)) + "%";
+        // taxable value after discounts
+        const taxable = (0, math_operations_1.Subtract)((0, util_1.GetNumber)(item.UnAmt), (0, math_operations_1.Add)((0, util_1.GetNumber)(item.Disc), (0, util_1.GetNumber)(item.RecDisc)));
+        if (!acc[percent]) {
+            acc[percent] = {
+                Tax: percent,
+                TaxableAmount: 0,
+                TaxAmount: 0,
+                CGSTAmount: 0,
+                SGSTAmount: 0,
+                IGSTAmount: 0
+            };
+        }
+        acc[percent].TaxableAmount = (0, math_operations_1.Add)(acc[percent].TaxableAmount, taxable);
+        acc[percent].TaxAmount = (0, math_operations_1.Add)(acc[percent].TaxAmount, (0, math_operations_1.Add)((0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.CGST)), 100), (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.SGST)), 100), (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.IGST)), 100)));
+        acc[percent].CGSTAmount = (0, math_operations_1.Add)(acc[percent].CGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.CGST)), 100));
+        acc[percent].SGSTAmount = (0, math_operations_1.Add)(acc[percent].SGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.SGST)), 100));
+        acc[percent].IGSTAmount = (0, math_operations_1.Add)(acc[percent].IGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.IGST)), 100));
+        return acc;
+    }, {}));
+}

package/package.json

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