shareneus 1.7.341 → 1.7.343

package/src/transaction-calculations/total-calculation.ts

@@ -55,12 +55,13 @@ function buildTaxesFromTaxCode(line: any, taxCode: any, netAmount: number): any[
     const taxComponents = safeArray(taxCode.Components);
     if (taxComponents.length > 0) {
         return taxComponents
-            .filter((component: any) => ["CGST", "SGST", "IGST"].includes(component?.Code))
+            .filter((component: any) => ["CGST", "SGST", "IGST", "CESS"].includes(component?.Code))
             .map((component: any) => ({
                 Code: component.Code,
                 Amt: Multiply(netAmount, Divide(GetNumber(component.Rate), 100)),
                 Rate: GetNumber(component.Rate),
-                TaxCodeId: GetNumber(taxCode._id)
+                TaxCodeId: GetNumber(taxCode._id),
+                CalcMethod: component.CalcMethod || "Percent",
             }))
             .filter((tax: any) => tax.Amt > 0);
     }
@@ -89,7 +90,10 @@ function getResolvedTaxes(line: any, taxCodes: any[] = []): any[] {
             Code: tax?.Code,
             Amt: GetNumber(tax?.Amt),
             Rate: GetNumber(tax?.Rate),
-            TaxCodeId: GetNumber(tax?.TaxCodeId)
+            TaxCodeId: GetNumber(tax?.TaxCodeId),
+            CalcMethod: tax?.CalcMethod || "Percent",
+            PerUnitAmt: GetNumber(tax?.PerUnitAmt),
+            Unit: tax?.Unit,
         })).filter((tax: any) => !!tax.Code);
     }
 
@@ -146,14 +150,17 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
     let totalSGST: number = 0;
     let totalCGST: number = 0;
     let totalIGST: number = 0;
+    let totalCESS: number = 0;
 
     let totalSGSTOnItems: number = 0;
     let totalCGSTOnItems: number = 0;
     let totalIGSTOnItems: number = 0;
+    let totalCESSOnItems: number = 0;
 
     let totalSGSTOnLabor: number = 0;
     let totalCGSTOnLabor: number = 0;
     let totalIGSTOnLabor: number = 0;
+    let totalCESSOnLabor: number = 0;
 
 
     // Calculate items totals with null safety
@@ -175,7 +182,8 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
                 const itemSGST = getTaxAmountByCode(resolvedItemTaxes, "SGST");
                 const itemCGST = getTaxAmountByCode(resolvedItemTaxes, "CGST");
                 const itemIGST = getTaxAmountByCode(resolvedItemTaxes, "IGST");
-                const itemTotalTax = Add(itemSGST, itemCGST, itemIGST);
+                const itemCESS = getTaxAmountByCode(resolvedItemTaxes, "CESS");
+                const itemTotalTax = Add(itemSGST, itemCGST, itemIGST, itemCESS);
 
                 // Add to return tax
                 returnTax = Add(returnTax, itemTotalTax);
@@ -197,13 +205,14 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
                 const itemSGST = getTaxAmountByCode(resolvedItemTaxes, "SGST");
                 const itemCGST = getTaxAmountByCode(resolvedItemTaxes, "CGST");
                 const itemIGST = getTaxAmountByCode(resolvedItemTaxes, "IGST");
-
+                const itemCESS = getTaxAmountByCode(resolvedItemTaxes, "CESS");
                 // Add individual tax amounts for items
                 totalSGSTOnItems = Add(totalSGSTOnItems, itemSGST);
                 totalCGSTOnItems = Add(totalCGSTOnItems, itemCGST);
                 totalIGSTOnItems = Add(totalIGSTOnItems, itemIGST);
+                totalCESSOnItems = Add(totalCESSOnItems, itemCESS);
 
-                totalTaxOnItems = Add(totalTaxOnItems, itemSGST, itemCGST, itemIGST);
+                totalTaxOnItems = Add(totalTaxOnItems, itemSGST, itemCGST, itemIGST, itemCESS);
             }
         }
     });
@@ -223,13 +232,15 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
             const opSGST = getTaxAmountByCode(resolvedOpTaxes, "SGST");
             const opCGST = getTaxAmountByCode(resolvedOpTaxes, "CGST");
             const opIGST = getTaxAmountByCode(resolvedOpTaxes, "IGST");
+            const opCESS = getTaxAmountByCode(resolvedOpTaxes, "CESS");
 
             // Add individual tax amounts for operations/labor
             totalSGSTOnLabor = Add(totalSGSTOnLabor, opSGST);
             totalCGSTOnLabor = Add(totalCGSTOnLabor, opCGST);
             totalIGSTOnLabor = Add(totalIGSTOnLabor, opIGST);
+            totalCESSOnLabor = Add(totalCESSOnLabor, opCESS);
 
-            totalTaxOnLabor = Add(totalTaxOnLabor, opSGST, opCGST, opIGST);
+            totalTaxOnLabor = Add(totalTaxOnLabor, opSGST, opCGST, opIGST, opCESS);
         }
     });
 
@@ -258,6 +269,7 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
         totalSGST = Add(totalSGSTOnItems, totalSGSTOnLabor);
         totalCGST = Add(totalCGSTOnItems, totalCGSTOnLabor);
         totalIGST = Add(totalIGSTOnItems, totalIGSTOnLabor);
+        totalCESS = Add(totalCESSOnItems, totalCESSOnLabor);
     }
 
     // FIXED CALCULATION: Correct order of operations
@@ -310,12 +322,15 @@ export function TotalCalculations(items: any[] = [], ops: any[] = [], isTaxable:
         result.totalSGST = totalSGST;
         result.totalCGST = totalCGST;
         result.totalIGST = totalIGST;
+        result.totalCESS = totalCESS;
         result.totalSGSTOnItems = totalSGSTOnItems;
         result.totalCGSTOnItems = totalCGSTOnItems;
         result.totalIGSTOnItems = totalIGSTOnItems;
+        result.totalCESSOnItems = totalCESSOnItems;
         result.totalSGSTOnLabor = totalSGSTOnLabor;
         result.totalCGSTOnLabor = totalCGSTOnLabor;
         result.totalIGSTOnLabor = totalIGSTOnLabor;
+        result.totalCESSOnLabor = totalCESSOnLabor;
 
         // Calculate tax summary for both new Taxes[] and legacy tax-code based records
         // Filter out items where Ret is true (only include non-return items)
@@ -380,6 +395,9 @@ export function TotalCalculationsWithDecimals(
         roundedResult.totalSGSTOnLabor = roundToDecimals(result.totalSGSTOnLabor);
         roundedResult.totalCGSTOnLabor = roundToDecimals(result.totalCGSTOnLabor);
         roundedResult.totalIGSTOnLabor = roundToDecimals(result.totalIGSTOnLabor);
+        roundedResult.totalCESS = roundToDecimals(result.totalCESS);
+        roundedResult.totalCESSOnItems = roundToDecimals(result.totalCESSOnItems);
+        roundedResult.totalCESSOnLabor = roundToDecimals(result.totalCESSOnLabor);
 
         // Round tax summary only if it exists
         if (result.itemsTaxSummary) {
@@ -389,7 +407,8 @@ export function TotalCalculationsWithDecimals(
                 TaxAmount: roundToDecimals(tax.TaxAmount),
                 CGSTAmount: roundToDecimals(tax.CGSTAmount),
                 SGSTAmount: roundToDecimals(tax.SGSTAmount),
-                IGSTAmount: roundToDecimals(tax.IGSTAmount)
+                IGSTAmount: roundToDecimals(tax.IGSTAmount),
+                CESSAmount: roundToDecimals(tax.CESSAmount)
             }));
         }
         if (result.opsTaxSummary) {
@@ -399,7 +418,8 @@ export function TotalCalculationsWithDecimals(
                 TaxAmount: roundToDecimals(tax.TaxAmount),
                 CGSTAmount: roundToDecimals(tax.CGSTAmount),
                 SGSTAmount: roundToDecimals(tax.SGSTAmount),
-                IGSTAmount: roundToDecimals(tax.IGSTAmount)
+                IGSTAmount: roundToDecimals(tax.IGSTAmount),
+                CESSAmount: roundToDecimals(tax.CESSAmount)
             }));
         }
     }
@@ -418,6 +438,7 @@ export function CalculateTaxSummary(items: any[], taxCodes: any[]) {
             const cgstAmount = getTaxAmountByCode(taxes, "CGST");
             const sgstAmount = getTaxAmountByCode(taxes, "SGST");
             const igstAmount = getTaxAmountByCode(taxes, "IGST");
+            const cessAmount = getTaxAmountByCode(taxes, "CESS");
             const totalTaxAmount = Add(cgstAmount, sgstAmount, igstAmount);
 
             if (!acc[percent]) {
@@ -427,7 +448,8 @@ export function CalculateTaxSummary(items: any[], taxCodes: any[]) {
                     TaxAmount: 0,
                     CGSTAmount: 0,
                     SGSTAmount: 0,
-                    IGSTAmount: 0
+                    IGSTAmount: 0,
+                    CESSAmount: 0
                 };
             }
 
@@ -436,6 +458,7 @@ export function CalculateTaxSummary(items: any[], taxCodes: any[]) {
             acc[percent].CGSTAmount = Add(acc[percent].CGSTAmount, cgstAmount);
             acc[percent].SGSTAmount = Add(acc[percent].SGSTAmount, sgstAmount);
             acc[percent].IGSTAmount = Add(acc[percent].IGSTAmount, igstAmount);
+            acc[percent].CESSAmount = Add(acc[percent].CESSAmount, cessAmount);
 
             return acc;
         }, {})