shareneus 1.4.48 → 1.4.50

package/dist/shared/shared-pdf.service.d.ts

@@ -465,22 +465,6 @@ export declare class SharedPDFService {
     }[];
     static CreateHSNTaxTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
     static CreateHSNTaxTable(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
-    static GetHCFinalTotalDetails(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any, BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any, ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any, ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, STotal: any, moreDiscDetails: boolean): {
-        columns: ({
-            style: string[];
-            lineHeight: number;
-            marginBottom: number;
-            width: string;
-            table: {
-                body: any;
-            };
-            layout: string;
-        } | {
-            text: string;
-            width: number;
-        })[];
-        marginLeft: number;
-    };
     static GetFinalTotalDetails1(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any, BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any, ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any, ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, CustLaborTaxGroupDataByPerc: any, STotal: any, isAuto: boolean, moreDiscDetails: boolean): {
         columns: ({
             style: string[];

package/dist/shared/shared-pdf.service.js

@@ -1536,40 +1536,42 @@ class SharedPDFService {
             return [{}];
         }
     }
-    static GetHCFinalTotalDetails(RecordData, BasicLaborTotal, OverAllMainLaborDiscount, LCGST, LSGST, LIGST, PIGST, ShowIGST, ShowTaxColumn, BasicPartsTotal, OverAllMainPartsDiscount, PCGST, PSGST, PartsTaxInfo, ShowAccParts, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, For, OverAllRecordTotal, Rounded, GrandTotal, ShowDetailedLaborTaxInfo, ShowDetailedPartTaxInfo, istaxable, LaborTotalTax, PartTotalTax, Consolidate, From, Adj, STotal, moreDiscDetails) {
-        let totalDisc;
-        let totalTax;
-        if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
-            if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
-            }
-            else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
-            }
-        }
-        return {
-            columns: [
-                // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
-                //   LSGST, LIGST, ShowIGST, ShowTaxColumn, ShowDetailedLaborTaxInfo),
-                { text: '', width: 225 },
-                // {
-                //   stack: [
-                //     this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
-                //       PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
-                //     this.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST,
-                //       ShowTaxColumn)
-                //   ]
-                // },
-                { text: '', width: 230 },
-                // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
-                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
-            ]
-            // columnGap: 40
-            ,
-            marginLeft: 10
-        };
-    }
+    // static GetHCFinalTotalDetails(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any,
+    //   BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any,
+    //   ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any,
+    //   OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any,
+    //   ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, STotal: any, moreDiscDetails: boolean) {
+    //   let totalDisc: any;
+    //   let totalTax: any;
+    //   if (!Consolidate) {
+    //     totalTax = TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+    //     if (istaxable) {
+    //       totalDisc = TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+    //     } else {
+    //       totalDisc = TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
+    //     }
+    //   }
+    //   return {
+    //     columns: [
+    //       // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
+    //       //   LSGST, LIGST, ShowIGST, ShowTaxColumn, ShowDetailedLaborTaxInfo),
+    //       { text: '', width: 225 },
+    //       // {
+    //       //   stack: [
+    //       //     this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
+    //       //       PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
+    //       //     this.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST,
+    //       //       ShowTaxColumn)
+    //       //   ]
+    //       // },
+    //       { text: '', width: 230 },
+    //       // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
+    //       this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
+    //     ]
+    //     // columnGap: 40
+    //     , marginLeft: 10
+    //   };
+    // }
     static GetFinalTotalDetails1(RecordData, BasicLaborTotal, OverAllMainLaborDiscount, LCGST, LSGST, LIGST, PIGST, ShowIGST, ShowTaxColumn, BasicPartsTotal, OverAllMainPartsDiscount, PCGST, PSGST, PartsTaxInfo, ShowAccParts, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, For, OverAllRecordTotal, Rounded, GrandTotal, ShowDetailedLaborTaxInfo, ShowDetailedPartTaxInfo, istaxable, LaborTotalTax, PartTotalTax, Consolidate, From, Adj, CustLaborTaxGroupDataByPerc, STotal, isAuto, moreDiscDetails) {
         let totalDisc;
         let totalTax;

package/dist/shared/shared-print.service.js

@@ -22,6 +22,7 @@ class PrintSharedService {
         // MyDate.UserTimeZone = EntityData.User.TZ;
         let Entity = {};
         Entity.User = EntityData.User;
+        Entity.DecimalsNumber = 2;
         if (tr_utils_1.TrUtils.IsNull(tempEntity.Settings.Common)) {
             tempEntity.Settings.Common = {};
         }

package/dist/utils/tr-utils.d.ts

@@ -1,5 +1,4 @@
 export declare class TrUtils {
-    static DecimalsNumber: number;
     static IsNull(Value: any): boolean;
     static IsEmpty(Value: any): boolean;
     static IsZero(Value: any): boolean;
@@ -7,8 +6,8 @@ export declare class TrUtils {
     static Stringify(RecordData: any): any;
     static ConcatObjects(obj1: any, obj2: any): any;
     static ConvertPercToVal(Discount: any, Total: any): number | null;
-    static FixedTo(value: any): number;
-    static FixPriceValue(Value: any): string;
+    static FixedTo(value: any, DecimalsNumber?: number): number;
+    static FixPriceValue(Value: any, DecimalsNumber?: number): string;
     static SetValueToZeroIfNull(Value: any): any;
     static SetPercToStringIfNull(Value: any): any;
     static SetPercToTrueIfNull(Value: any): any;

package/dist/utils/tr-utils.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrUtils = void 0;
+const aggregation_1 = require("../aggregation/aggregation");
 class TrUtils {
+    // static DecimalsNumber:number=2;
     static IsNull(Value) {
         return Value === null || typeof Value === 'undefined';
     }
@@ -39,29 +41,29 @@ class TrUtils {
             if (this.IsNull(Total)) {
                 Total = 0;
             }
-            let value = this.FixedTo(((Total * Discount) / 100));
+            let value = this.FixedTo((0, aggregation_1.division)((0, aggregation_1.multiply)(Total, Discount), 100));
             if (isNaN(value)) {
                 value = 0;
             }
             return value;
         }
     }
-    static FixedTo(value) {
+    static FixedTo(value, DecimalsNumber = 2) {
         if (this.IsNull(value)) {
             value = 0;
         }
         value = Number(value);
-        let Result = value.toFixed(this.DecimalsNumber);
+        let Result = value.toFixed(DecimalsNumber);
         return Number(Result);
     }
-    static FixPriceValue(Value) {
+    static FixPriceValue(Value, DecimalsNumber = 2) {
         if (this.IsNull(Value)) {
             Value = 0;
         }
         if (typeof Value === 'string') {
             Value = Number(Value);
         }
-        let Result = Value.toFixed(this.DecimalsNumber);
+        let Result = Value.toFixed(DecimalsNumber);
         return Result;
     }
     static SetValueToZeroIfNull(Value) {
@@ -90,4 +92,3 @@ class TrUtils {
     }
 }
 exports.TrUtils = TrUtils;
-TrUtils.DecimalsNumber = 2;

package/package.json

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