shareneus 1.5.2 → 1.5.4

package/dist/shared/math-operations.js

@@ -33,7 +33,7 @@ function Add(...numbers) {
         result = result.plus(bigNumber);
     }
     // Convert back to JavaScript number type
-    return result.toNumber();
+    return Number(result.toString());
 }
 /**
  * Subtracts multiple numbers with high precision using Big.js
@@ -53,7 +53,7 @@ function Subtract(...numbers) {
         result = result.minus(bigNumber);
     }
     // Convert back to JavaScript number type
-    return result.toNumber();
+    return Number(result.toString());
 }
 /**
  * Multiplies multiple numbers with high precision using Big.js
@@ -72,10 +72,10 @@ function Multiply(...numbers) {
     // Multiply each subsequent number with the result using a for loop
     for (let i = 1; i < numbers.length; i++) {
         const bigNumber = new big_js_1.default(numbers[i]);
-        result = result.mul(bigNumber);
+        result = result.times(bigNumber);
     }
     // Convert back to JavaScript number type
-    return result.toNumber();
+    return Number(result.toString());
 }
 /**
  * Divides multiple numbers with high precision using Big.js
@@ -101,7 +101,7 @@ function Divide(...numbers) {
         result = result.div(bigNumber);
     }
     // Convert back to JavaScript number type
-    return result.toNumber();
+    return Number(result.toString());
 }
 /**
  * Calculates discounted or marked-up price based on a percentage
@@ -111,29 +111,26 @@ function Divide(...numbers) {
  * @returns The final price after discount/markup as a number
  */
 function CalcDiscPrice(originalPrice, discountPercentage, markUp = false) {
-    console.log("DiscountedPrice");
-    console.log(originalPrice);
-    console.log(discountPercentage);
+    const price = (0, util_js_1.GetNumber)(originalPrice);
+    const perc = (0, util_js_1.GetNumber)(discountPercentage);
+    const discountAmount = Multiply(price, Divide(perc, 100));
+    return markUp ? Add(price, discountAmount) : Subtract(price, discountAmount);
     // Convert inputs to Big.js objects for precision
-    const price = new big_js_1.default((0, util_js_1.GetNumber)(originalPrice));
-    const percentage = new big_js_1.default((0, util_js_1.GetNumber)(discountPercentage)).div(100);
-    // Calculate the amount to add or subtract
-    const discountAmount = price.mul(percentage);
-    console.log(discountAmount.toNumber());
-    console.log(markUp);
-    // Calculate final price directly with Big.js
-    let result;
-    if (markUp) {
-        // Perform markup calculation (add the calculated amount)
-        result = price.plus(discountAmount);
-    }
-    else {
-        // Perform discount calculation (subtract the calculated amount)
-        result = price.minus(discountAmount);
-    }
-    const finalPrice = result.toNumber();
-    console.log(finalPrice);
-    return finalPrice;
+    // const price = new Big(GetNumber(originalPrice));
+    // const percentage = new Big(GetNumber(discountPercentage)).div(100);
+    // // Calculate the amount to add or subtract
+    // const discountAmount = price.mul(percentage);
+    // // Calculate final price directly with Big.js
+    // let result: any;
+    // if (markUp) {
+    //     // Perform markup calculation (add the calculated amount)
+    //     result = price.plus(discountAmount);
+    // } else {
+    //     // Perform discount calculation (subtract the calculated amount)
+    //     result = price.minus(discountAmount);
+    // }
+    // const finalPrice = result.toNumber();
+    // return finalPrice;
 }
 /**
  * Calculates a price with markup applied
@@ -142,14 +139,18 @@ function CalcDiscPrice(originalPrice, discountPercentage, markUp = false) {
  * @returns The final marked-up price as a number
  */
 function CalcMarkup(originalPrice, markupPercentage) {
+    const price = (0, util_js_1.GetNumber)(originalPrice);
+    const perc = (0, util_js_1.GetNumber)(markupPercentage);
+    const markupAmount = Multiply(price, Divide(perc, 100));
+    return Add(price, markupAmount);
     // Convert inputs to Big.js objects for precision
-    const price = new big_js_1.default((0, util_js_1.GetNumber)(originalPrice));
-    const percentage = new big_js_1.default((0, util_js_1.GetNumber)(markupPercentage)).div(100);
-    // Calculate markup amount based on percentage of original price
-    const markupAmount = price.mul(percentage);
-    // Add markup amount to original price
-    const result = price.plus(markupAmount);
-    return result.toNumber();
+    // const price = new Big(GetNumber(originalPrice));
+    // const percentage = new Big(GetNumber(markupPercentage)).div(100);
+    // // Calculate markup amount based on percentage of original price
+    // const markupAmount = price.mul(percentage);
+    // // Add markup amount to original price
+    // const result = price.plus(markupAmount);
+    // return result.toNumber();
 }
 /**
  * Calculates a price with markdown (discount) applied
@@ -158,14 +159,18 @@ function CalcMarkup(originalPrice, markupPercentage) {
  * @returns The final marked-down price as a number
  */
 function CalcMarkdown(originalPrice, markdownPercentage) {
+    const price = (0, util_js_1.GetNumber)(originalPrice);
+    const perc = (0, util_js_1.GetNumber)(markdownPercentage);
+    const markdownAmount = Multiply(price, Divide(perc, 100));
+    return Subtract(price, markdownAmount);
     // Convert inputs to Big.js objects for precision
-    const price = new big_js_1.default((0, util_js_1.GetNumber)(originalPrice));
-    const percentage = new big_js_1.default((0, util_js_1.GetNumber)(markdownPercentage)).div(100);
-    // Calculate markdown amount based on percentage of original price
-    const markdownAmount = price.mul(percentage);
-    // Subtract markdown amount from original price
-    const result = price.minus(markdownAmount);
-    return result.toNumber();
+    // const price = new Big(GetNumber(originalPrice));
+    // const percentage = new Big(GetNumber(markdownPercentage)).div(100);
+    // // Calculate markdown amount based on percentage of original price
+    // const markdownAmount = price.mul(percentage);
+    // // Subtract markdown amount from original price
+    // const result = price.minus(markdownAmount);
+    // return result.toNumber();
 }
 /**
  * Calculates the margin value as a percentage based on price and cost

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

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedPDFService = void 0;
 const jsbarcode_1 = __importDefault(require("jsbarcode"));
-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");
+const math_operations_1 = require("./math-operations");
 class SharedPDFService {
     static MainHeading(CName, Entity, Image, HColor, CopyName) {
         let headerstyle;
@@ -1612,12 +1612,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         // let serviceName: string;
@@ -1740,12 +1740,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         return {
@@ -1989,7 +1989,7 @@ class SharedPDFService {
         }
         else {
             if (!Consolidate) {
-                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) });
+                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
             }
         }
         if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {

package/package.json

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