shareneus 1.4.50 → 1.4.51

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedPDFService = void 0;
+const aggregation_1 = require("../aggregation/aggregation");
 const enums_1 = require("../enums/enums");
 const my_date_1 = require("../utils/my-date");
 const tr_utils_1 = require("../utils/tr-utils");
@@ -1576,12 +1577,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         let serviceName;
@@ -1626,27 +1627,27 @@ class SharedPDFService {
         ];
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
-                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
+                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, RecordData.Entity.DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
-                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
+                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc, RecordData.Entity.DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
-                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, RecordData.Entity.DecimalsNumber) });
             }
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
         }
         if (!Consolidate) {
-            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(STotal) });
+            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(STotal, RecordData.Entity.DecimalsNumber) });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
             AccountFields.push({ name: 'Total Tax', value: totalTax });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
             if (Adj > 0) {
-                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj);
+                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj, RecordData.Entity.DecimalsNumber);
             }
             AccountFields.push({ name: 'Adjust', value: Adj });
         }
@@ -1705,12 +1706,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         return {
@@ -1725,7 +1726,7 @@ class SharedPDFService {
                 },
                 { text: '', width: moreDiscDetails ? 40 : 60 },
                 // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
-                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
+                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails, RecordData)
             ]
             // columnGap: 40
             ,
@@ -1736,12 +1737,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(PartTotalTax), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount), RecordData.Entity.DecimalsNumber);
             }
         }
         return {
@@ -1757,21 +1758,21 @@ class SharedPDFService {
                 },
                 { text: '', width: 100 },
                 { text: '', width: 80 },
-                this.DebitGrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails)
+                this.DebitGrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails, RecordData.Entity.DecimalsNumber)
             ]
             // columnGap: 40
             ,
             marginLeft: 10
         };
     }
-    static DebitGrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails) {
+    static DebitGrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails, DecimalsNumber) {
         let AccountFields = [
             //   { name: 'Labor Total', value: LaborAfterGST },
             // { name: 'Part Total', value: PartsAfterGST },
-            { name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))) },
+            { name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), DecimalsNumber) },
         ];
         if (moreDiscDetails) {
-            AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+            AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, DecimalsNumber) });
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
@@ -1838,7 +1839,7 @@ class SharedPDFService {
                         this.GetTaxOnParts(ROPrintData.BasicPartsTotal, ROPrintData.OverAllMainPartsDiscount, ROPrintData.PCGST, ROPrintData.PSGST, ROPrintData.PIGST, ROPrintData.ShowIGST, ROPrintData.ShowAccParts, ROPrintData.ShowTaxColumn, ROPrintData.ShowDetailedPartTaxInfo, ROPrintData.Type, ROPrintData.Consolidate),
                         this.PartsTaxAmounts(ROPrintData.PartsTaxInfo, ROPrintData.ShowAccParts, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn)
                     ]
-                }, { text: '', width: 200 }, this.GrandTotal(ROPrintData, ROPrintData.LaborAfterGST, ROPrintData.PartsAfterGST, ROPrintData.OverAllRecordDiscount, null, ROPrintData.For, ROPrintData.OverAllRecordTotal, ROPrintData.Rounded, ROPrintData.GrandTotal, ROPrintData.Adj, ROPrintData.Consolidate, null, moreDiscDetails)
+                }, { text: '', width: 200 }, this.GrandTotal(ROPrintData, ROPrintData.LaborAfterGST, ROPrintData.PartsAfterGST, ROPrintData.OverAllRecordDiscount, null, ROPrintData.For, ROPrintData.OverAllRecordTotal, ROPrintData.Rounded, ROPrintData.GrandTotal, ROPrintData.Adj, ROPrintData.Consolidate, null, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)
             ]
             // columnGap: 40
             ,
@@ -1930,31 +1931,31 @@ class SharedPDFService {
             return this.emptyObject();
         }
     }
-    static GrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails) {
+    static GrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails, DecimalsNumber) {
         let AccountFields = [
         //   { name: 'Labor Total', value: LaborAfterGST },
         // { name: 'Part Total', value: PartsAfterGST },
         ];
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
-                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
+                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
-                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
+                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
-                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, DecimalsNumber) });
             }
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
         }
         if (!Consolidate && !tr_utils_1.TrUtils.IsNull(subTotal)) {
-            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal))) });
+            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal)), DecimalsNumber) });
         }
         else {
             if (!Consolidate) {
-                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))) });
+                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
             }
         }
         if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
@@ -1962,7 +1963,7 @@ class SharedPDFService {
         }
         if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
             if (Adj > 0) {
-                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj);
+                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj, DecimalsNumber);
             }
             AccountFields.push({ name: 'Adjust', value: Adj });
         }
@@ -2083,7 +2084,7 @@ class SharedPDFService {
         });
         return body;
     }
-    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter) {
+    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter, DecimalsNumber) {
         if (Type === 'Invoice' && !isCounter) {
             return {
                 // lineHeight: 0.7,
@@ -2092,8 +2093,8 @@ class SharedPDFService {
                 marginBottom: 5,
                 table: {
                     widths: [200, 174, 174],
-                    body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid) },
-                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due) },
+                    body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber) },
+                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) },
                             { text: 'Status : ' + Status }]]
                 },
                 layout: this.LayOutStyle(),

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

@@ -5,7 +5,7 @@ export declare class TrUtils {
     static IsFixedZero(Value: any): boolean;
     static Stringify(RecordData: any): any;
     static ConcatObjects(obj1: any, obj2: any): any;
-    static ConvertPercToVal(Discount: any, Total: any): number | null;
+    static ConvertPercToVal(Discount: any, Total: any, DecimalsNumber?: number): number | null;
     static FixedTo(value: any, DecimalsNumber?: number): number;
     static FixPriceValue(Value: any, DecimalsNumber?: number): string;
     static SetValueToZeroIfNull(Value: any): any;

package/dist/utils/tr-utils.js

@@ -30,7 +30,7 @@ class TrUtils {
         }
         return obj1;
     }
-    static ConvertPercToVal(Discount, Total) {
+    static ConvertPercToVal(Discount, Total, DecimalsNumber = 2) {
         if (this.IsNull(Total)) {
             return null;
         }
@@ -41,7 +41,7 @@ class TrUtils {
             if (this.IsNull(Total)) {
                 Total = 0;
             }
-            let value = this.FixedTo((0, aggregation_1.division)((0, aggregation_1.multiply)(Total, Discount), 100));
+            let value = this.FixedTo((0, aggregation_1.division)((0, aggregation_1.multiply)(Total, Discount), 100), DecimalsNumber);
             if (isNaN(value)) {
                 value = 0;
             }

package/package.json

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