@jsdev_ninja/core 0.14.5 → 0.14.7

package/dist/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAoB,MAAM,aAAa,CAAC;AA8BjE,wBAAgB,WAAW,CAAC,EAC3B,IAAI,EACJ,SAAS,EACT,aAAiB,EACjB,iBAAqB,EACrB,oBAA4B,GAC5B,EAAE;IACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAC/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+FA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAY,MAAM,aAAa,CAAC;AAmCzD,wBAAgB,WAAW,CAAC,EAC3B,IAAI,EACJ,SAAS,EACT,aAAiB,EACjB,iBAAqB,EACrB,oBAA4B,GAC5B,EAAE;IACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAC/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqFA"}

package/dist/lib/utils/index.js

@@ -1,8 +1,8 @@
-import { DiscountEngine } from "../entities/Discount/engine";
+// import { DiscountEngine } from "../entities/Discount/engine";
 const CONFIG = {
     VAT: 18,
 };
-function calculateDiscount(product) {
+function calculateDiscount(product, isVatIncludedInPrice) {
     if (product.discount?.type === "percent") {
         return (product.price * (product.discount.value ?? 100)) / 100;
     }
@@ -11,38 +11,41 @@ function calculateDiscount(product) {
     }
     return 0;
 }
-function getPriceAfterDiscount(product) {
+function getPriceAfterDiscount(product, isVatIncludedInPrice) {
+    const price = isVatIncludedInPrice && product.vat
+        ? product.price + (product.price * CONFIG.VAT) / 100
+        : product.price;
     if (product.discount?.type === "percent") {
-        const dscountAmount = (product.price * product.discount.value) / 100;
+        const dscountAmount = (price * product.discount.value) / 100;
         return product.price - dscountAmount;
     }
     if (product.discount?.type === "number") {
-        const dscountAmount = product.price - product.discount.value;
+        const dscountAmount = price - product.discount.value;
         return dscountAmount;
     }
-    return product.price;
+    return price;
 }
 // main
 export function getCartCost({ cart, discounts, deliveryPrice = 0, freeDeliveryPrice = 0, isVatIncludedInPrice = false, }) {
     // Convert cart items to the format expected by the discount engine
-    const cartForEngine = cart.map((item) => ({
-        amount: item.amount,
-        product: {
-            id: item.product.id,
-            price: item.product.price,
-        },
-    }));
+    // const cartForEngine = cart.map((item) => ({
+    // 	amount: item.amount,
+    // 	product: {
+    // 		id: item.product.id,
+    // 		price: item.product.price,
+    // 	},
+    // }));
     // Apply discounts using the new discount engine
-    const discountResult = DiscountEngine.calculateDiscounts(cartForEngine, discounts);
+    // const discountResult = DiscountEngine.calculateDiscounts(cartForEngine, discounts);
     // Map the results back to the original format with additional product info
     const result = cart.map((item, index) => {
-        const engineItem = discountResult.items[index];
+        // const engineItem = discountResult.items[index];
         return {
             amount: item.amount,
             product: { ...item.product },
             originalPrice: item.product.price,
-            finalPrice: engineItem ? engineItem.finalPrice : getPriceAfterDiscount(item.product),
-            finalDiscount: engineItem ? engineItem.finalDiscount : calculateDiscount(item.product),
+            finalPrice: getPriceAfterDiscount(item.product, isVatIncludedInPrice),
+            finalDiscount: calculateDiscount(item.product, isVatIncludedInPrice),
         };
     });
     // isVatIncludedInPrice = false
@@ -77,13 +80,6 @@ export function getCartCost({ cart, discounts, deliveryPrice = 0, freeDeliveryPr
         acc.discount = Number(acc.discount.toFixed(2));
         acc.finalCost = Number(acc.finalCost.toFixed(2));
         acc.productsCost = Number(acc.productsCost.toFixed(2));
-        // console.log(
-        // 	"product",
-        // 	product.name[0].value,
-        // 	finalPrice,
-        // 	amount,
-        // 	amount * roundedFinalPrice + (isVatIncludedInPrice ? 0 : productVatValue)
-        // );
         return acc;
     }, {
         discount: 0,
@@ -99,6 +95,5 @@ export function getCartCost({ cart, discounts, deliveryPrice = 0, freeDeliveryPr
     else {
         cartDetails.finalCost += cartDetails.deliveryPrice;
     }
-    console.log("cartDetails", cartDetails);
     return { items: result, ...cartDetails };
 }

package/dist/lib/utils/storeCalculator/storeCalculator.test.js

@@ -34,6 +34,9 @@ describe("storeCalculator", () => {
         test("return 0 when sale price is 0", () => {
             expect(storeCalculator.calcMarginFromSalePrice(0, 100)).toBe(0);
         });
+        test("return 24.53 when sale price is less than purchase price", () => {
+            expect(storeCalculator.calcMarginFromSalePrice(10.6, 8)).toBe(24.53);
+        });
         test("return 0 when purchase price is 0", () => {
             expect(storeCalculator.calcMarginFromSalePrice(100, 0)).toBe(0);
         });