shareneus 1.6.67 → 1.6.68

package/dist/sales/sales/sales-totals.service.d.ts

@@ -25,5 +25,7 @@ export declare class SalesTotalsService {
     static GetCombinedTaxPercentage(Items: any, TaxCodes: any): any;
     static CompareItemsByHSN(Items: 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 GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
 }

package/dist/sales/sales/sales-totals.service.js

@@ -48,9 +48,9 @@ class SalesTotalsService {
         Item.UnPr = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.UnPr);
         Item.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.Disc);
         Item.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.RecDisc);
-        Item.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST);
-        Item.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST);
-        Item.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
+        Item.CGST = this.GetTaxAmountFromTaxes(Item, 'CGST');
+        Item.SGST = this.GetTaxAmountFromTaxes(Item, 'SGST');
+        Item.IGST = this.GetTaxAmountFromTaxes(Item, 'IGST');
         return Item;
     }
     static GetFinalRODataForSave(ItemsList, IsIndependentTax, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, isRoundable, DecimalsNumber) {
@@ -283,9 +283,9 @@ class SalesTotalsService {
                 Item.HSN = '';
             }
             let TaxInfo = this.GetGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            Item.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[0]);
-            Item.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
-            Item.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[2]);
+            Item.CGSTAmt = this.GetTaxRateFromTaxes(Item, 'CGST');
+            Item.SGSTAmt = this.GetTaxRateFromTaxes(Item, 'SGST');
+            Item.IGSTAmt = this.GetTaxRateFromTaxes(Item, 'IGST');
             Item.CombinedTaxPercentage = (0, math_operations_1.Add)(Item.CGSTAmt, Item.SGSTAmt, Item.IGSTAmt);
         });
         return Items;
@@ -361,6 +361,22 @@ class SalesTotalsService {
         });
         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 GetGSTValueBasedOnTaxCode(TCode, TaxCodes) {
         let CGST = 0;
         let SGST = 0;

package/package.json

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