@jsdev_ninja/core 0.12.10 → 0.13.13

package/dist/entities/Product.js

@@ -44,7 +44,7 @@ export const ProductSchema = z.object({
     updated_at: z.number(),
     categoryIds: z.array(z.string().nonempty()),
     // @deprecated
-    categoryList: z.array(CategorySchema),
+    categoryList: z.array(CategorySchema).optional(),
     // @deprecated
     categories: z.object({
         lvl0: z.array(z.string()),
@@ -52,9 +52,9 @@ export const ProductSchema = z.object({
         lvl2: z.array(z.string()),
         lvl3: z.array(z.string()),
         lvl4: z.array(z.string()),
-    }),
+    }).optional(),
     // @deprecated
-    categoryNames: z.array(z.string()),
+    categoryNames: z.array(z.string()).optional(),
 });
 export const NewProductSchema = ProductSchema.extend({
     image: z.instanceof(File).optional(),

package/dist/entities/Profile.d.ts

@@ -41,6 +41,7 @@ export declare const ProfileSchema: z.ZodObject<{
     createdDate: z.ZodNumber;
     lastActivityDate: z.ZodNumber;
     paymentType: z.ZodEnum<["default", "delayed"]>;
+    organizationId: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     type: "Profile";
     id: string;
@@ -65,6 +66,7 @@ export declare const ProfileSchema: z.ZodObject<{
         apartmentEnterNumber: string;
         apartmentNumber: string;
     } | undefined;
+    organizationId?: string | undefined;
 }, {
     type: "Profile";
     id: string;
@@ -89,6 +91,7 @@ export declare const ProfileSchema: z.ZodObject<{
         apartmentEnterNumber: string;
         apartmentNumber: string;
     } | undefined;
+    organizationId?: string | undefined;
 }>;
 export type TProfile = z.infer<typeof ProfileSchema>;
 export declare function createEmptyProfile(): TProfile;

package/dist/entities/Profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../lib/entities/Profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,wBAAwB,mCAAiC,CAAC;AACvE,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE3E,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBxB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAErD,wBAAgB,kBAAkB,IAAI,QAAQ,CAyB7C"}
+{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../lib/entities/Profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,wBAAwB,mCAEnC,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE3E,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBxB,CAAC;AAEH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAErD,wBAAgB,kBAAkB,IAAI,QAAQ,CAyB7C"}

package/dist/entities/Profile.js

@@ -1,7 +1,9 @@
 import { z } from "zod";
 import { AddressSchema } from "./Address";
 import { notEmptyTextSchema } from "./Atoms";
-export const ProfilePaymentTypeSchema = z.enum(["default", "delayed"]);
+export const ProfilePaymentTypeSchema = z.enum(["default", "delayed"], {
+    description: "delayed is J5 transaction",
+});
 export const ProfileSchema = z.object({
     type: z.literal("Profile"),
     id: notEmptyTextSchema,
@@ -18,6 +20,7 @@ export const ProfileSchema = z.object({
     createdDate: z.number(),
     lastActivityDate: z.number(),
     paymentType: ProfilePaymentTypeSchema,
+    organizationId: z.string().optional(),
 });
 export function createEmptyProfile() {
     return {

package/dist/entities/Store.d.ts

@@ -25,9 +25,9 @@ export declare const StoreSchema: z.ZodObject<{
     allowAnonymousClients: boolean;
     isVatIncludedInPrice: boolean;
     clientTypes: ("company" | "individual")[];
+    deliveryPrice?: number | undefined;
     minimumOrder?: number | undefined;
     freeDeliveryPrice?: number | undefined;
-    deliveryPrice?: number | undefined;
 }, {
     id: string;
     companyId: string;
@@ -39,9 +39,9 @@ export declare const StoreSchema: z.ZodObject<{
     allowAnonymousClients: boolean;
     isVatIncludedInPrice: boolean;
     clientTypes: ("company" | "individual")[];
+    deliveryPrice?: number | undefined;
     minimumOrder?: number | undefined;
     freeDeliveryPrice?: number | undefined;
-    deliveryPrice?: number | undefined;
 }>;
 export type TStore = z.infer<typeof StoreSchema>;
 //# sourceMappingURL=Store.d.ts.map

package/dist/entities/index.d.ts

@@ -10,4 +10,5 @@ export * from "./Product";
 export * from "./Profile";
 export * from "./Store";
 export * from "./Discount";
+export * from "./Organization";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/entities/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/entities/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC"}

package/dist/entities/index.js

@@ -10,3 +10,4 @@ export * from "./Product";
 export * from "./Profile";
 export * from "./Store";
 export * from "./Discount";
+export * from "./Organization";

package/dist/firebase-api/index.d.ts

@@ -13,6 +13,7 @@ export declare const storeCollections: {
     readonly payments: "payments";
     readonly settings: "settings";
     readonly discounts: "discounts";
+    readonly organizations: "organizations";
 };
 export declare const FirestoreApi: {
     systemCollections: {
@@ -30,6 +31,7 @@ export declare const FirestoreApi: {
         readonly payments: "payments";
         readonly settings: "settings";
         readonly discounts: "discounts";
+        readonly organizations: "organizations";
     };
     getPath: ({ companyId, storeId, collectionName, id, }: {
         companyId: string;
@@ -56,6 +58,7 @@ export declare const FirebaseAPI: {
             readonly payments: "payments";
             readonly settings: "settings";
             readonly discounts: "discounts";
+            readonly organizations: "organizations";
         };
         getPath: ({ companyId, storeId, collectionName, id, }: {
             companyId: string;

package/dist/firebase-api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/firebase-api/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB;;;CAGpB,CAAC;AAEX,eAAO,MAAM,gBAAgB;;;;;;;;;;;CAWnB,CAAC;AAEX,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;2DASrB;QACF,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,OAAO,gBAAgB,CAAC;QAC9C,EAAE,CAAC,EAAE,MAAM,CAAC;KACZ;iCAI4B,MAAM,OAAO,gBAAgB;CAG1D,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;+DAdpB;YACF,SAAS,EAAE,MAAM,CAAC;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,cAAc,EAAE,MAAM,OAAO,gBAAgB,CAAC;YAC9C,EAAE,CAAC,EAAE,MAAM,CAAC;SACZ;qCAI4B,MAAM,OAAO,gBAAgB;;CAO1D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/firebase-api/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB;;;CAGpB,CAAC;AAEX,eAAO,MAAM,gBAAgB;;;;;;;;;;;;CAYnB,CAAC;AAEX,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;2DASrB;QACF,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,OAAO,gBAAgB,CAAC;QAC9C,EAAE,CAAC,EAAE,MAAM,CAAC;KACZ;iCAI4B,MAAM,OAAO,gBAAgB;CAG1D,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;+DAdpB;YACF,SAAS,EAAE,MAAM,CAAC;YAClB,OAAO,EAAE,MAAM,CAAC;YAChB,cAAc,EAAE,MAAM,OAAO,gBAAgB,CAAC;YAC9C,EAAE,CAAC,EAAE,MAAM,CAAC;SACZ;qCAI4B,MAAM,OAAO,gBAAgB;;CAO1D,CAAC"}

package/dist/firebase-api/index.js

@@ -13,6 +13,7 @@ export const storeCollections = {
     payments: "payments",
     settings: "settings",
     discounts: "discounts",
+    organizations: "organizations",
 };
 export const FirestoreApi = {
     systemCollections,

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/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/entities/discount/engine.ts","../lib/entities/discount/factory.ts","../lib/entities/discount/index.ts","../lib/entities/discount/strategy.ts","../lib/entities/discount/types.ts","../lib/entities/discount/utils.ts","../lib/entities/discount/__tests__/engine.test.ts","../lib/entities/discount/__tests__/factory.test.ts","../lib/entities/discount/__tests__/integration.test.ts","../lib/entities/discount/__tests__/simple.test.ts","../lib/entities/discount/__tests__/utils.test.ts","../lib/entities/discount/strategies/bundlestrategy.ts","../lib/entities/discount/strategies/__tests__/bundlestrategy.test.ts","../lib/firebase-api/app.ts","../lib/firebase-api/index.ts","../lib/utils/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/favoriteproduct.ts","../lib/entities/locale.ts","../lib/entities/order.ts","../lib/entities/organization.ts","../lib/entities/product.ts","../lib/entities/profile.ts","../lib/entities/store.ts","../lib/entities/index.ts","../lib/entities/discount/engine.ts","../lib/entities/discount/factory.ts","../lib/entities/discount/index.ts","../lib/entities/discount/strategy.ts","../lib/entities/discount/types.ts","../lib/entities/discount/utils.ts","../lib/entities/discount/__tests__/engine.test.ts","../lib/entities/discount/__tests__/factory.test.ts","../lib/entities/discount/__tests__/integration.test.ts","../lib/entities/discount/__tests__/simple.test.ts","../lib/entities/discount/__tests__/utils.test.ts","../lib/entities/discount/strategies/bundlestrategy.ts","../lib/entities/discount/strategies/__tests__/bundlestrategy.test.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

@@ -62,7 +62,10 @@ export declare function getCartCost({ cart, discounts, store, }: {
             created_at: number;
             updated_at: number;
             categoryIds: string[];
-            categoryList: ({
+            purchasePrice?: number | undefined;
+            profitPercentage?: number | undefined;
+            isDiscountable?: boolean | undefined;
+            categoryList?: ({
                 id: string;
                 companyId: string;
                 storeId: string;
@@ -86,18 +89,15 @@ export declare function getCartCost({ cart, discounts, store, }: {
                     parentId?: string | null | undefined;
                     tag?: string | undefined;
                 } & /*elided*/ any)[];
-            })[];
-            categories: {
+            })[] | undefined;
+            categories?: {
                 lvl0: string[];
                 lvl1: string[];
                 lvl2: string[];
                 lvl3: string[];
                 lvl4: string[];
-            };
-            categoryNames: string[];
-            purchasePrice?: number | undefined;
-            profitPercentage?: number | undefined;
-            isDiscountable?: boolean | undefined;
+            } | undefined;
+            categoryNames?: string[] | undefined;
         };
         originalPrice: number;
         finalPrice: number;

package/dist/utils/index.js

@@ -26,7 +26,7 @@ function getPriceAfterDiscount(product) {
 export function getCartCost({ cart, discounts, store, }) {
     const { isVatIncludedInPrice } = store;
     // Convert cart items to the format expected by the discount engine
-    const cartForEngine = cart.map(item => ({
+    const cartForEngine = cart.map((item) => ({
         amount: item.amount,
         product: {
             id: item.product.id,
@@ -35,7 +35,6 @@ export function getCartCost({ cart, discounts, store, }) {
     }));
     // Apply discounts using the new discount engine
     const discountResult = DiscountEngine.calculateDiscounts(cartForEngine, discounts);
-    console.log("discountResult", discountResult);
     // Map the results back to the original format with additional product info
     const result = cart.map((item, index) => {
         const engineItem = discountResult.items[index];
@@ -70,7 +69,8 @@ export function getCartCost({ cart, discounts, store, }) {
         acc.cost += amount * roundedFinalPrice;
         acc.discount += finalDiscount ? amount * finalDiscount : finalDiscount;
         acc.finalCost += amount * roundedFinalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
-        acc.productsCost += amount * roundedFinalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
+        acc.productsCost +=
+            amount * roundedFinalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
         // Round all accumulated values to prevent floating point errors
         acc.cost = Number(acc.cost.toFixed(2));
         acc.discount = Number(acc.discount.toFixed(2));

package/lib/entities/Discount/engine.ts

@@ -1,129 +1,138 @@
 import { TDiscount, AppliedDiscount, DiscountContext } from "./types";
 import { DiscountStrategyFactory } from "./factory";
 
+// discount engine - calculate discounts and return final prices
+// should register all discount types
+// should receive all store discounts
+// should check active discount that should be applied on cart
+// should find best discount per product
+// should apply discount to if stackable or best one
+// any applyd discount should mark products that effected and price before and after and average price per product in cart
+// should return items list with all calculations and final prices and discounts
+
 export class DiscountEngine {
-  static calculateDiscounts(
-    cart: Array<{
-      amount: number;
-      product: {
-        id: string;
-        price: number;
-      };
-    }>,
-    discounts: TDiscount[],
-    user?: Record<string, unknown>
-  ): {
-    items: Array<{
-      amount: number;
-      product: {
-        id: string;
-        price: number;
-      };
-      originalPrice: number;
-      finalPrice: number;
-      finalDiscount: number;
-      appliedDiscounts: string[];
-    }>;
-    totalDiscount: number;
-    appliedDiscounts: AppliedDiscount[];
-  } {
-    const context: DiscountContext = {
-      cart,
-      user,
-      appliedDiscounts: [],
-    };
-    
-    // Filter active discounts
-    const activeDiscounts = this.filterActiveDiscounts(discounts);
-    
-    // Apply discounts
-    const appliedDiscounts: AppliedDiscount[] = [];
-    
-    for (const discount of activeDiscounts) {
-      const strategy = DiscountStrategyFactory.getStrategy(discount);
-      if (!strategy) continue;
-      
-      // Check if discount can be applied
-      if (!strategy.canApply(discount, context)) continue;
-      
-      // Check if discount is stackable
-      if (!discount.conditions?.stackable && appliedDiscounts.length > 0) continue;
-      
-      // Calculate discount
-      const result = strategy.calculate(discount, context);
-      if (!result.applicable) continue;
-      
-      // Apply discount
-      appliedDiscounts.push({
-        discountId: discount.id,
-        discountName: discount.name[0]?.value || "Discount",
-        discountAmount: Number(result.discountAmount.toFixed(2)),
-        affectedItems: result.affectedItems,
-      });
-      
-      // Update context for next iteration
-      context.appliedDiscounts = appliedDiscounts;
-    }
-    
-    // Calculate final prices
-    const items = this.calculateFinalPrices(cart, appliedDiscounts);
-    
-    const totalDiscount = appliedDiscounts.reduce((sum, discount) => 
-      sum + discount.discountAmount, 0);
-    
-    return {
-      items,
-      totalDiscount: Number(totalDiscount.toFixed(2)),
-      appliedDiscounts,
-    };
-  }
-  
-  private static filterActiveDiscounts(discounts: TDiscount[]): TDiscount[] {
-    const now = Date.now();
-    return discounts.filter(discount => 
-      discount.active && 
-      discount.startDate <= now && 
-      discount.endDate >= now
-    );
-  }
-  
-  private static calculateFinalPrices(
-    cart: DiscountContext["cart"], 
-    appliedDiscounts: AppliedDiscount[]
-  ) {
-    return cart.map(item => {
-      const itemDiscounts = appliedDiscounts.filter(discount =>
-        discount.affectedItems.some(affected => affected.productId === item.product.id)
-      );
-      
-      const totalItemDiscount = itemDiscounts.reduce((sum, discount) => {
-        const affectedItem = discount.affectedItems.find(affected => 
-          affected.productId === item.product.id);
-        return sum + (affectedItem?.discountAmount || 0);
-      }, 0);
-      
-      const discountPerUnit = totalItemDiscount / item.amount;
-      const finalPrice = item.product.price - discountPerUnit;
-      
-      return {
-        amount: item.amount,
-        product: item.product,
-        originalPrice: Number(item.product.price.toFixed(2)),
-        finalPrice: Number(Math.max(0, finalPrice).toFixed(2)),
-        finalDiscount: Number(totalItemDiscount.toFixed(2)),
-        appliedDiscounts: itemDiscounts.map(d => d.discountId),
-      };
-    });
-  }
-  
-  static isDiscountActive(discount: TDiscount): boolean {
-    const now = Date.now();
-    return discount.active && 
-           discount.startDate <= now && 
-           discount.endDate >= now;
-  }
-  
-  static getActiveDiscounts(discounts: TDiscount[]): TDiscount[] {
-    return this.filterActiveDiscounts(discounts);
-  }
-} 
+	static calculateDiscounts(
+		cart: Array<{
+			amount: number;
+			product: {
+				id: string;
+				price: number;
+			};
+		}>,
+		discounts: TDiscount[],
+		user?: Record<string, unknown>
+	): {
+		items: Array<{
+			amount: number;
+			product: {
+				id: string;
+				price: number;
+			};
+			originalPrice: number;
+			finalPrice: number;
+			finalDiscount: number;
+			appliedDiscounts: string[];
+		}>;
+		totalDiscount: number;
+		appliedDiscounts: AppliedDiscount[];
+	} {
+		const context: DiscountContext = {
+			cart,
+			user,
+			appliedDiscounts: [],
+		};
+
+		// Filter active discounts
+		const activeDiscounts = this.filterActiveDiscounts(discounts);
+
+		// Apply discounts
+		const appliedDiscounts: AppliedDiscount[] = [];
+
+		for (const discount of activeDiscounts) {
+			const strategy = DiscountStrategyFactory.getStrategy(discount);
+			if (!strategy) continue;
+
+			// Check if discount can be applied
+			if (!strategy.canApply(discount, context)) continue;
+
+			// Check if discount is stackable
+			// todo
+			if (!discount.conditions?.stackable && appliedDiscounts.length > 0) continue;
+
+			// Calculate discount
+			const result = strategy.calculate(discount, context);
+			if (!result.applicable) continue;
+
+			// Apply discount
+			appliedDiscounts.push({
+				discountId: discount.id,
+				discountName: discount.name[0]?.value || "Discount",
+				discountAmount: Number(result.discountAmount.toFixed(2)),
+				affectedItems: result.affectedItems,
+			});
+
+			// Update context for next iteration
+			context.appliedDiscounts = appliedDiscounts;
+		}
+
+		// Calculate final prices
+		const items = this.calculateFinalPrices(cart, appliedDiscounts);
+
+		const totalDiscount = appliedDiscounts.reduce(
+			(sum, discount) => sum + discount.discountAmount,
+			0
+		);
+
+		return {
+			items,
+			totalDiscount: Number(totalDiscount.toFixed(2)),
+			appliedDiscounts,
+		};
+	}
+
+	private static filterActiveDiscounts(discounts: TDiscount[]): TDiscount[] {
+		const now = Date.now();
+		return discounts.filter(
+			(discount) => discount.active && discount.startDate <= now && discount.endDate >= now
+		);
+	}
+
+	private static calculateFinalPrices(
+		cart: DiscountContext["cart"],
+		appliedDiscounts: AppliedDiscount[]
+	) {
+		return cart.map((item) => {
+			const itemDiscounts = appliedDiscounts.filter((discount) =>
+				discount.affectedItems.some((affected) => affected.productId === item.product.id)
+			);
+
+			const totalItemDiscount = itemDiscounts.reduce((sum, discount) => {
+				const affectedItem = discount.affectedItems.find(
+					(affected) => affected.productId === item.product.id
+				);
+				return sum + (affectedItem?.discountAmount || 0);
+			}, 0);
+
+			const discountPerUnit = totalItemDiscount / item.amount;
+			const finalPrice = item.product.price - discountPerUnit;
+
+			return {
+				amount: item.amount,
+				product: item.product,
+				originalPrice: Number(item.product.price.toFixed(2)),
+				finalPrice: Number(Math.max(0, finalPrice).toFixed(2)),
+				finalDiscount: Number(totalItemDiscount.toFixed(2)),
+				appliedDiscounts: itemDiscounts.map((d) => d.discountId),
+			};
+		});
+	}
+
+	static isDiscountActive(discount: TDiscount): boolean {
+		const now = Date.now();
+		return discount.active && discount.startDate <= now && discount.endDate >= now;
+	}
+
+	static getActiveDiscounts(discounts: TDiscount[]): TDiscount[] {
+		return this.filterActiveDiscounts(discounts);
+	}
+}

package/lib/entities/Order.ts

@@ -34,6 +34,7 @@ export const OrderSchema = z.object({
 		cartDiscount: z.number(),
 		cartTotal: z.number(),
 		cartVat: z.number(),
+		deliveryPrice: z.number().optional(),
 	}),
 	originalAmount: z.number().positive().optional(), // what client pay
 	actualAmount: z.number().positive().optional(), // what store charge

package/lib/entities/Organization.ts

@@ -0,0 +1,14 @@
+import { z } from "zod";
+
+// client organization for clients
+export const OrganizationSchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	discountPercentage: z.number().positive().min(0).max(100).optional(),
+	nameOnInvoice: z.string().optional(),
+});
+
+export const NewOrganizationSchema = OrganizationSchema.omit({ id: true });
+
+export type TNewOrganization = z.infer<typeof NewOrganizationSchema>;
+export type TOrganization = z.infer<typeof OrganizationSchema>;

package/lib/entities/Product.ts

@@ -47,7 +47,7 @@ export const ProductSchema = z.object({
 	categoryIds: z.array(z.string().nonempty()),
 
 	// @deprecated
-	categoryList: z.array(CategorySchema),
+	categoryList: z.array(CategorySchema).optional(),
 	// @deprecated
 	categories: z.object({
 		lvl0: z.array(z.string()),
@@ -55,9 +55,9 @@ export const ProductSchema = z.object({
 		lvl2: z.array(z.string()),
 		lvl3: z.array(z.string()),
 		lvl4: z.array(z.string()),
-	}),
+	}).optional(),
 	// @deprecated
-	categoryNames: z.array(z.string()),
+	categoryNames: z.array(z.string()).optional(),
 });
 export type TProduct = z.infer<typeof ProductSchema>;
 

package/lib/entities/Profile.ts

@@ -23,6 +23,7 @@ export const ProfileSchema = z.object({
 	createdDate: z.number(),
 	lastActivityDate: z.number(),
 	paymentType: ProfilePaymentTypeSchema,
+	organizationId: z.string().optional(),
 });
 
 export type TProfile = z.infer<typeof ProfileSchema>;

package/lib/entities/index.ts

@@ -10,3 +10,4 @@ export * from "./Product";
 export * from "./Profile";
 export * from "./Store";
 export * from "./Discount";
+export * from "./Organization";

package/lib/firebase-api/index.ts

@@ -14,6 +14,7 @@ export const storeCollections = {
 	payments: "payments",
 	settings: "settings",
 	discounts: "discounts",
+	organizations: "organizations",
 } as const;
 
 export const FirestoreApi = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jsdev_ninja/core",
-	"version": "0.12.10",
+	"version": "0.13.13",
 	"main": "dist/core.cjs.js",
 	"module": "dist/core.es.js",
 	"types": "dist/index.d.ts",