shareneus 1.4.98 → 1.5.0

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

@@ -563,7 +563,7 @@ class SalesReceivePdfService {
     }
     static CommonTotalDetails(SRPrintData, moreDiscDetails) {
         let CommonDetails = [
-            shared_pdf_service_1.SharedPDFService.GetDebitTotalDetails(SRPrintData, 0, 0, 0, 0, 0, SRPrintData.CustPartIGST, SRPrintData.ShowIGST, SRPrintData.ShowTaxColumn, SRPrintData.CustPartsTotalBeforeDisc, SRPrintData.CustPartsDiscTotal, SRPrintData.CustPartCGST, SRPrintData.CustPartSGST, SRPrintData.CustTaxGroupData, SRPrintData.ShowAccParts, SRPrintData.CustLaborAfterTax, SRPrintData.CustPartAfterTax, SRPrintData.FixedDisc, SRPrintData.For, SRPrintData.FixedTotal, SRPrintData.CustTotalRoundedBy, SRPrintData.CustRoundedTotal, SRPrintData.ShowTaxColumn, SRPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(SRPrintData.Settings.Tax), SRPrintData.CustLaborITax, SRPrintData.CustPartITax, SRPrintData.Consolidate, SRPrintData.From, moreDiscDetails),
+            shared_pdf_service_1.SharedPDFService.GetDebitTotalDetails(SRPrintData, 0, 0, 0, 0, 0, SRPrintData.totalIGST, SRPrintData.ShowIGST, SRPrintData.ShowTaxColumn, SRPrintData.subtotal, SRPrintData.totalDiscount, SRPrintData.totalCGST, SRPrintData.totalSGST, SRPrintData.CustTaxGroupData, SRPrintData.ShowAccParts, SRPrintData.CustLaborAfterTax, SRPrintData.CustPartAfterTax, SRPrintData.FixedDisc, SRPrintData.For, SRPrintData.total, SRPrintData.roundOff, SRPrintData.totalAfterRounded, SRPrintData.ShowTaxColumn, SRPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(SRPrintData.Settings.Tax), SRPrintData.CustLaborITax, SRPrintData.totalTax, SRPrintData.Consolidate, SRPrintData.From, moreDiscDetails),
             shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(SRPrintData.Type, SRPrintData.Paid, SRPrintData.Due, SRPrintData.Sts, false, SRPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(SRPrintData.Entity.Terms),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),

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;
@@ -26,6 +28,7 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
     let totalDiscountOnItems = 0;
     let totalDiscountOnLabor = 0;
     let roundOff = 0;
+    let totalAfterRounded = 0;
     // Tax breakdown totals - only calculate if taxable
     let totalSGST = 0;
     let totalCGST = 0;
@@ -93,10 +96,11 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false) {
     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,
+        totalAfterRounded,
         subtotal,
         totalDiscount,
         roundOff,
@@ -106,7 +110,7 @@ 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.totalTaxOnItems = totalTaxOnItems;
@@ -120,19 +124,23 @@ 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
     const roundedResult = {
         total: roundToDecimals(result.total),
+        totalAfterRounded: roundToDecimals(result.totalAfterRounded),
         subtotal: roundToDecimals(result.subtotal),
         totalDiscount: roundToDecimals(result.totalDiscount),
         roundOff: roundToDecimals(result.roundOff),
@@ -142,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);
@@ -156,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 key = tax.Code;
+        // 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[key]) {
+            acc[key] = {
+                Tax: key,
+                TaxableAmount: 0,
+                TaxAmount: 0,
+                CGSTAmount: 0,
+                SGSTAmount: 0,
+                IGSTAmount: 0
+            };
+        }
+        acc[key].TaxableAmount = (0, math_operations_1.Add)(acc[key].TaxableAmount, taxable);
+        acc[key].TaxAmount = (0, math_operations_1.Add)(acc[key].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[key].CGSTAmount = (0, math_operations_1.Add)(acc[key].CGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.CGST)), 100));
+        acc[key].SGSTAmount = (0, math_operations_1.Add)(acc[key].SGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.SGST)), 100));
+        acc[key].IGSTAmount = (0, math_operations_1.Add)(acc[key].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.98",
+  "version": "1.5.00",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",