@jsdev_ninja/core 0.10.8 → 0.11.0

package/dist/entities/Product.d.ts

@@ -104,49 +104,49 @@ export declare const ProductSchema: z.ZodObject<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     }, z.ZodTypeDef, {
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     }>, "many">;
     categories: z.ZodObject<{
@@ -223,25 +223,25 @@ export declare const ProductSchema: z.ZodObject<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     })[];
     categories: {
@@ -309,25 +309,25 @@ export declare const ProductSchema: z.ZodObject<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     })[];
     categories: {
@@ -448,49 +448,49 @@ export declare const NewProductSchema: z.ZodObject<z.objectUtil.extendShape<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     }, z.ZodTypeDef, {
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     }>, "many">;
     categories: z.ZodObject<{
@@ -569,25 +569,25 @@ export declare const NewProductSchema: z.ZodObject<z.objectUtil.extendShape<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     })[];
     categories: {
@@ -656,25 +656,25 @@ export declare const NewProductSchema: z.ZodObject<z.objectUtil.extendShape<{
         id: string;
         companyId: string;
         storeId: string;
-        tag: string;
         locales: {
             value: string;
             lang: "he";
         }[];
         depth: number;
         parentId?: string | null | undefined;
+        tag?: string | undefined;
     } & {
         children: ({
             id: string;
             companyId: string;
             storeId: string;
-            tag: string;
             locales: {
                 value: string;
                 lang: "he";
             }[];
             depth: number;
             parentId?: string | null | undefined;
+            tag?: string | undefined;
         } & /*elided*/ any)[];
     })[];
     categories: {

package/dist/tsconfig.app.tsbuildinfo

@@ -1 +1 @@
-{"root":["../lib/index.tsx","../lib/entities/address.ts","../lib/entities/atoms.ts","../lib/entities/cart.ts","../lib/entities/category.ts","../lib/entities/company.ts","../lib/entities/discount.ts","../lib/entities/favoriteproduct.ts","../lib/entities/locale.ts","../lib/entities/order.ts","../lib/entities/product.ts","../lib/entities/profile.ts","../lib/entities/store.ts","../lib/entities/index.ts","../lib/firebase-api/app.ts","../lib/firebase-api/index.ts"],"version":"5.7.3"}
+{"root":["../lib/index.tsx","../lib/entities/address.ts","../lib/entities/atoms.ts","../lib/entities/cart.ts","../lib/entities/category.ts","../lib/entities/company.ts","../lib/entities/discount.ts","../lib/entities/favoriteproduct.ts","../lib/entities/locale.ts","../lib/entities/order.ts","../lib/entities/product.ts","../lib/entities/profile.ts","../lib/entities/store.ts","../lib/entities/index.ts","../lib/firebase-api/app.ts","../lib/firebase-api/index.ts","../lib/utils/index.ts"],"version":"5.7.3"}

package/dist/utils/index.d.ts

@@ -0,0 +1,111 @@
+import { TCart, TDiscount, TStore } from "../entities";
+export declare function getCartCost({ cart, discounts, store, }: {
+    cart: TCart["items"];
+    discounts: TDiscount[];
+    store: TStore;
+}): {
+    discount: number;
+    cost: number;
+    finalCost: number;
+    vat: number;
+    items: {
+        amount: number;
+        product: {
+            type: "Product";
+            id: string;
+            companyId: string;
+            storeId: string;
+            objectID: string;
+            sku: string;
+            name: {
+                value: string;
+                lang: "he";
+            }[];
+            description: {
+                value: string;
+                lang: "he";
+            }[];
+            isPublished: boolean;
+            vat: boolean;
+            priceType: {
+                value: number;
+                type: "unit" | "kg" | "gram" | "liter" | "ml";
+            };
+            price: number;
+            currency: "ILS";
+            discount: {
+                value: number;
+                type: "number" | "percent" | "none";
+            };
+            weight: {
+                value: number;
+                unit: "kg" | "gram" | "none";
+            };
+            volume: {
+                value: number;
+                unit: "liter" | "ml" | "none";
+            };
+            images: {
+                id: string;
+                url: string;
+            }[];
+            manufacturer: string;
+            brand: string;
+            importer: string;
+            supplier: string;
+            ingredients: {
+                value: string;
+                lang: "he";
+            }[];
+            created_at: number;
+            updated_at: number;
+            categoryIds: string[];
+            categoryList: ({
+                id: string;
+                companyId: string;
+                storeId: string;
+                locales: {
+                    value: string;
+                    lang: "he";
+                }[];
+                depth: number;
+                parentId?: string | null | undefined;
+                tag?: string | undefined;
+            } & {
+                children: ({
+                    id: string;
+                    companyId: string;
+                    storeId: string;
+                    locales: {
+                        value: string;
+                        lang: "he";
+                    }[];
+                    depth: number;
+                    parentId?: string | null | undefined;
+                    tag?: string | undefined;
+                } & /*elided*/ any)[];
+            })[];
+            categories: {
+                lvl0: string[];
+                lvl1: string[];
+                lvl2: string[];
+                lvl3: string[];
+                lvl4: string[];
+            };
+            categoryNames: string[];
+            purchasePrice?: number | undefined;
+            profitPercentage?: number | undefined;
+            isDiscountable?: boolean | undefined;
+        };
+        originalPrice: number;
+        finalPrice: number;
+        finalDiscount: number;
+    }[];
+};
+export declare function calculateCartPrice(items: TCart["items"]): {
+    cost: number;
+    discount: number;
+    vat: number;
+    finalCost: number;
+};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAY,MAAM,EAAE,MAAM,aAAa,CAAC;AA6BjE,wBAAgB,WAAW,CAAC,EAC3B,IAAI,EACJ,SAAS,EACT,KAAK,GACL,EAAE;IACF,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACrB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyIA;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;;;;;EA4BvD"}

package/dist/utils/index.js

@@ -0,0 +1,149 @@
+const CONFIG = {
+    VAT: 18,
+};
+function calculateDiscount(product) {
+    if (product.discount?.type === "percent") {
+        return (product.price * (product.discount.value ?? 100)) / 100;
+    }
+    if (product.discount?.type === "number") {
+        return product.price - (product.discount.value ?? 0);
+    }
+    return 0;
+}
+function getPriceAfterDiscount(product) {
+    if (product.discount?.type === "percent") {
+        const dscountAmount = (product.price * product.discount.value) / 100;
+        return product.price - dscountAmount;
+    }
+    if (product.discount?.type === "number") {
+        const dscountAmount = product.price - product.discount.value;
+        return dscountAmount;
+    }
+    return product.price;
+}
+// main
+export function getCartCost({ cart, discounts, store, }) {
+    const { isVatIncludedInPrice } = store;
+    let result = cart.map((item) => {
+        return {
+            amount: item.amount,
+            product: { ...item.product },
+            originalPrice: item.product.price,
+            finalPrice: item.product.price,
+            finalDiscount: 0,
+        };
+    });
+    const activeDiscounts = discounts.filter((discount) => {
+        if (discount.variant.variantType === "bundle") {
+            const productsTotal = cart?.reduce((total, item) => {
+                if (discount.variant.productsId.includes(item.product.id)) {
+                    total += item.amount;
+                    return total;
+                }
+                return total;
+            }, 0) ?? 0;
+            if (productsTotal >= discount.variant.requiredQuantity) {
+                // const times = Math.floor(productsTotal / discount.variant.requiredQuantity);
+                // console.log("yes", times, discount.variant.discountPrice);
+                return true;
+            }
+        }
+        return false;
+    });
+    console.log("activeDiscounts", activeDiscounts);
+    activeDiscounts.forEach((discount) => {
+        if (discount.variant.variantType === "bundle") {
+            // get all products in cart
+            const products = cart.filter((item) => discount.variant.productsId.includes(item.product.id));
+            const productsTotal = products?.reduce((total, item) => {
+                if (discount.variant.productsId.includes(item.product.id)) {
+                    total += item.amount;
+                    return total;
+                }
+                return total;
+            }, 0) ?? 0;
+            const times = Math.floor(productsTotal / discount.variant.requiredQuantity);
+            const price = getPriceAfterDiscount(products[0]?.product);
+            const _discount = calculateDiscount(products[0]?.product);
+            console.log("price", price, _discount);
+            const discountPrice = Number((discount.variant.discountPrice / discount.variant.requiredQuantity).toFixed(2)) * 1;
+            console.log("discountPrice", discountPrice);
+            const totalDiscount = (price * discount.variant.requiredQuantity - discount.variant.discountPrice) * times;
+            const originalPrice = productsTotal * price;
+            const discountPriceFinal = originalPrice - totalDiscount;
+            console.log("totalDiscount", totalDiscount);
+            console.log("discountPriceFinal", discountPriceFinal, originalPrice);
+            const averagePrice = Number((discountPriceFinal / productsTotal).toFixed(2));
+            console.log("averagePrice", averagePrice);
+            result = result.map((item) => {
+                if (discount.variant.productsId.includes(item.product.id)) {
+                    return {
+                        ...item,
+                        finalPrice: averagePrice,
+                        originalPrice: item.product.price,
+                        finalDiscount: item.product.price - averagePrice,
+                    };
+                }
+                return item;
+            });
+            console.log("averagePrice", averagePrice);
+            console.log("yes", times, discount.variant.requiredQuantity, discount.variant.discountPrice);
+            console.log("dis", productsTotal, products);
+            // find average price
+        }
+    });
+    console.log("result", result);
+    const cartDetails = result.reduce((acc, item) => {
+        const { product, amount, finalPrice, finalDiscount } = item;
+        console.log("isVatIncludedInPrice", isVatIncludedInPrice);
+        let productVatValue = 0;
+        if (product.vat) {
+            if (isVatIncludedInPrice) {
+                const vat_amount = finalPrice * (CONFIG.VAT / (100 + CONFIG.VAT));
+                productVatValue = Number(vat_amount.toFixed(2));
+                productVatValue = productVatValue * amount;
+                acc.vat += Number(productVatValue.toFixed(2));
+            }
+            else {
+                productVatValue = (finalPrice * CONFIG.VAT) / 100;
+                productVatValue = productVatValue * amount;
+                acc.vat += Number(productVatValue.toFixed(2));
+            }
+        }
+        console.log("finalDiscount", finalDiscount);
+        acc.cost += amount * finalPrice;
+        acc.discount += finalDiscount ? amount * finalDiscount : finalDiscount;
+        acc.finalCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
+        return acc;
+    }, {
+        discount: 0,
+        cost: 0,
+        finalCost: 0,
+        vat: 0,
+    });
+    console.log("cartDetails", cartDetails);
+    return { items: result, ...cartDetails };
+}
+export function calculateCartPrice(items) {
+    return (items ?? []).reduce((acc, item) => {
+        const { product, amount } = item;
+        const productPrice = getPriceAfterDiscount(product);
+        const discount = calculateDiscount(product);
+        const realPrice = product.price - discount;
+        let productVatValue = 0;
+        if (product.vat) {
+            productVatValue = (realPrice * CONFIG.VAT) / 100;
+            productVatValue = productVatValue * amount;
+            acc.vat += productVatValue;
+        }
+        acc.cost += amount * product.price;
+        acc.discount += discount ? amount * discount : discount;
+        acc.finalCost += amount * productPrice + productVatValue;
+        return acc;
+    }, {
+        cost: 0,
+        discount: 0,
+        vat: 0,
+        finalCost: 0,
+    });
+}

package/lib/entities/Category.ts

@@ -6,7 +6,7 @@ export const BaseCategorySchema = z.object({
 	companyId: z.string().min(1),
 	storeId: z.string().min(1),
 	parentId: z.string().nullish(),
-	tag: z.string().min(1),
+	tag: z.string().optional(),
 	locales: z.array(LocaleSchema),
 	depth: z.number(),
 });

package/lib/utils/index.ts

@@ -0,0 +1,205 @@
+import { TCart, TDiscount, TProduct, TStore } from "../entities";
+
+const CONFIG = {
+	VAT: 18,
+};
+
+function calculateDiscount(product: TProduct) {
+	if (product.discount?.type === "percent") {
+		return (product.price * (product.discount.value ?? 100)) / 100;
+	}
+	if (product.discount?.type === "number") {
+		return product.price - (product.discount.value ?? 0);
+	}
+	return 0;
+}
+
+function getPriceAfterDiscount(product: TProduct) {
+	if (product.discount?.type === "percent") {
+		const dscountAmount = (product.price * product.discount.value) / 100;
+		return product.price - dscountAmount;
+	}
+	if (product.discount?.type === "number") {
+		const dscountAmount = product.price - product.discount.value;
+		return dscountAmount;
+	}
+	return product.price;
+}
+
+// main
+export function getCartCost({
+	cart,
+	discounts,
+	store,
+}: {
+	cart: TCart["items"];
+	discounts: TDiscount[];
+	store: TStore;
+}) {
+	const { isVatIncludedInPrice } = store;
+	let result = cart.map((item) => {
+		return {
+			amount: item.amount,
+			product: { ...item.product },
+			originalPrice: item.product.price,
+			finalPrice: item.product.price,
+			finalDiscount: 0,
+		};
+	});
+
+	const activeDiscounts = discounts.filter((discount) => {
+		if (discount.variant.variantType === "bundle") {
+			const productsTotal =
+				cart?.reduce((total, item) => {
+					if (discount.variant.productsId.includes(item.product.id)) {
+						total += item.amount;
+						return total;
+					}
+					return total;
+				}, 0) ?? 0;
+			if (productsTotal >= discount.variant.requiredQuantity) {
+				// const times = Math.floor(productsTotal / discount.variant.requiredQuantity);
+				// console.log("yes", times, discount.variant.discountPrice);
+				return true;
+			}
+		}
+		return false;
+	});
+	console.log("activeDiscounts", activeDiscounts);
+
+	activeDiscounts.forEach((discount) => {
+		if (discount.variant.variantType === "bundle") {
+			// get all products in cart
+			const products = cart.filter((item) =>
+				discount.variant.productsId.includes(item.product.id)
+			);
+			const productsTotal =
+				products?.reduce((total, item) => {
+					if (discount.variant.productsId.includes(item.product.id)) {
+						total += item.amount;
+						return total;
+					}
+					return total;
+				}, 0) ?? 0;
+
+			const times = Math.floor(productsTotal / discount.variant.requiredQuantity);
+			const price = getPriceAfterDiscount(products[0]?.product);
+			const _discount = calculateDiscount(products[0]?.product);
+			console.log("price", price, _discount);
+			const discountPrice =
+				Number(
+					(discount.variant.discountPrice / discount.variant.requiredQuantity).toFixed(2)
+				) * 1;
+
+			console.log("discountPrice", discountPrice);
+			const totalDiscount =
+				(price * discount.variant.requiredQuantity - discount.variant.discountPrice) * times;
+
+			const originalPrice = productsTotal * price;
+			const discountPriceFinal = originalPrice - totalDiscount;
+
+			console.log("totalDiscount", totalDiscount);
+
+			console.log("discountPriceFinal", discountPriceFinal, originalPrice);
+
+			const averagePrice = Number((discountPriceFinal / productsTotal).toFixed(2));
+			console.log("averagePrice", averagePrice);
+
+			result = result.map((item) => {
+				if (discount.variant.productsId.includes(item.product.id)) {
+					return {
+						...item,
+						finalPrice: averagePrice,
+						originalPrice: item.product.price,
+						finalDiscount: item.product.price - averagePrice,
+					};
+				}
+				return item;
+			});
+
+			console.log("averagePrice", averagePrice);
+
+			console.log(
+				"yes",
+				times,
+				discount.variant.requiredQuantity,
+				discount.variant.discountPrice
+			);
+
+			console.log("dis", productsTotal, products);
+
+			// find average price
+		}
+	});
+
+	console.log("result", result);
+
+	const cartDetails = result.reduce(
+		(acc, item) => {
+			const { product, amount, finalPrice, finalDiscount } = item;
+			console.log("isVatIncludedInPrice", isVatIncludedInPrice);
+
+			let productVatValue: number = 0;
+			if (product.vat) {
+				if (isVatIncludedInPrice) {
+					const vat_amount = finalPrice * (CONFIG.VAT / (100 + CONFIG.VAT));
+					productVatValue = Number(vat_amount.toFixed(2));
+					productVatValue = productVatValue * amount;
+
+					acc.vat += Number(productVatValue.toFixed(2));
+				} else {
+					productVatValue = (finalPrice * CONFIG.VAT) / 100;
+					productVatValue = productVatValue * amount;
+					acc.vat += Number(productVatValue.toFixed(2));
+				}
+			}
+			console.log("finalDiscount", finalDiscount);
+
+			acc.cost += amount * finalPrice;
+			acc.discount += finalDiscount ? amount * finalDiscount : finalDiscount;
+			acc.finalCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
+
+			return acc;
+		},
+		{
+			discount: 0,
+			cost: 0,
+			finalCost: 0,
+			vat: 0,
+		}
+	);
+
+	console.log("cartDetails", cartDetails);
+
+	return { items: result, ...cartDetails };
+}
+
+export function calculateCartPrice(items: TCart["items"]) {
+	return (items ?? []).reduce(
+		(acc, item) => {
+			const { product, amount } = item;
+			const productPrice = getPriceAfterDiscount(product);
+			const discount = calculateDiscount(product);
+
+			const realPrice = product.price - discount;
+
+			let productVatValue: number = 0;
+			if (product.vat) {
+				productVatValue = (realPrice * CONFIG.VAT) / 100;
+				productVatValue = productVatValue * amount;
+				acc.vat += productVatValue;
+			}
+			acc.cost += amount * product.price;
+			acc.discount += discount ? amount * discount : discount;
+			acc.finalCost += amount * productPrice + productVatValue;
+
+			return acc;
+		},
+		{
+			cost: 0,
+			discount: 0,
+			vat: 0,
+			finalCost: 0,
+		}
+	);
+}