@jsdev_ninja/core 0.11.6 → 0.11.8

package/dist/entities/Order.js

@@ -35,7 +35,7 @@ export const OrderSchema = z.object({
     originalAmount: z.number().positive().optional(), // what client pay
     actualAmount: z.number().positive().optional(), // what store charge
     date: z.number(),
-    deliveryDate: z.number().optional(),
+    deliveryDate: z.coerce.number().optional(),
     createdAt: z.number().optional(),
     client: ProfileSchema.required({}),
 });

package/dist/entities/Store.d.ts

@@ -11,7 +11,8 @@ declare const StoreSchema: z.ZodObject<{
     isVatIncludedInPrice: z.ZodBoolean;
     clientTypes: z.ZodArray<z.ZodEnum<["individual", "company"]>, "many">;
     minimumOrder: z.ZodOptional<z.ZodNumber>;
-    freeOrderPrice: z.ZodOptional<z.ZodNumber>;
+    freeDeliveryPrice: z.ZodOptional<z.ZodNumber>;
+    deliveryPrice: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     id: string;
     companyId: string;
@@ -24,7 +25,8 @@ declare const StoreSchema: z.ZodObject<{
     isVatIncludedInPrice: boolean;
     clientTypes: ("company" | "individual")[];
     minimumOrder?: number | undefined;
-    freeOrderPrice?: number | undefined;
+    freeDeliveryPrice?: number | undefined;
+    deliveryPrice?: number | undefined;
 }, {
     id: string;
     companyId: string;
@@ -37,7 +39,8 @@ declare const StoreSchema: z.ZodObject<{
     isVatIncludedInPrice: boolean;
     clientTypes: ("company" | "individual")[];
     minimumOrder?: number | undefined;
-    freeOrderPrice?: number | undefined;
+    freeDeliveryPrice?: number | undefined;
+    deliveryPrice?: number | undefined;
 }>;
 export type TStore = z.infer<typeof StoreSchema>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../lib/entities/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAaf,CAAC;AACH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}
+{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../lib/entities/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAcf,CAAC;AACH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/entities/Store.js

@@ -12,5 +12,6 @@ const StoreSchema = z.object({
     isVatIncludedInPrice: z.boolean(),
     clientTypes: z.array(clientTypesSchema),
     minimumOrder: z.number().optional(),
-    freeOrderPrice: z.number().optional(),
+    freeDeliveryPrice: z.number().optional(),
+    deliveryPrice: z.number().optional(),
 });

package/dist/utils/index.d.ts

@@ -8,6 +8,8 @@ export declare function getCartCost({ cart, discounts, store, }: {
     cost: number;
     finalCost: number;
     vat: number;
+    productsCost: number;
+    deliveryPrice: number;
     items: {
         amount: number;
         product: {
@@ -102,10 +104,4 @@ export declare function getCartCost({ cart, discounts, store, }: {
         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

@@ -1 +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"}
+{"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmJA"}

package/dist/utils/index.js

@@ -81,6 +81,7 @@ export function getCartCost({ cart, discounts, store, }) {
                         ...item,
                         finalPrice: averagePrice,
                         originalPrice: item.product.price,
+                        discountPrice: price,
                         finalDiscount: item.product.price - averagePrice,
                     };
                 }
@@ -114,36 +115,22 @@ export function getCartCost({ cart, discounts, store, }) {
         acc.cost += amount * finalPrice;
         acc.discount += finalDiscount ? amount * finalDiscount : finalDiscount;
         acc.finalCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
+        acc.productsCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
         return acc;
     }, {
         discount: 0,
         cost: 0,
         finalCost: 0,
         vat: 0,
+        productsCost: 0,
+        deliveryPrice: store?.deliveryPrice ?? 0,
     });
+    if (cartDetails.deliveryPrice && cartDetails.productsCost >= (store.freeDeliveryPrice ?? 0)) {
+        cartDetails.deliveryPrice = 0;
+    }
+    else {
+        cartDetails.finalCost += cartDetails.deliveryPrice;
+    }
     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/Order.ts

@@ -39,7 +39,7 @@ export const OrderSchema = z.object({
 	originalAmount: z.number().positive().optional(), // what client pay
 	actualAmount: z.number().positive().optional(), // what store charge
 	date: z.number(),
-	deliveryDate: z.number().optional(),
+	deliveryDate: z.coerce.number().optional(),
 	createdAt: z.number().optional(),
 	client: ProfileSchema.required({}),
 });

package/lib/entities/Store.ts

@@ -13,6 +13,7 @@ const StoreSchema = z.object({
 	isVatIncludedInPrice: z.boolean(),
 	clientTypes: z.array(clientTypesSchema),
 	minimumOrder: z.number().optional(),
-	freeOrderPrice: z.number().optional(),
+	freeDeliveryPrice: z.number().optional(),
+	deliveryPrice: z.number().optional(),
 });
 export type TStore = z.infer<typeof StoreSchema>;

package/lib/utils/index.ts

@@ -111,6 +111,7 @@ export function getCartCost({
 						...item,
 						finalPrice: averagePrice,
 						originalPrice: item.product.price,
+						discountPrice: price,
 						finalDiscount: item.product.price - averagePrice,
 					};
 				}
@@ -158,6 +159,7 @@ export function getCartCost({
 			acc.cost += amount * finalPrice;
 			acc.discount += finalDiscount ? amount * finalDiscount : finalDiscount;
 			acc.finalCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
+			acc.productsCost += amount * finalPrice + (isVatIncludedInPrice ? 0 : productVatValue);
 
 			return acc;
 		},
@@ -166,40 +168,18 @@ export function getCartCost({
 			cost: 0,
 			finalCost: 0,
 			vat: 0,
+			productsCost: 0,
+			deliveryPrice: store?.deliveryPrice ?? 0,
 		}
 	);
 
+	if (cartDetails.deliveryPrice && cartDetails.productsCost >= (store.freeDeliveryPrice ?? 0)) {
+		cartDetails.deliveryPrice = 0;
+	} else {
+		cartDetails.finalCost += cartDetails.deliveryPrice;
+	}
+
 	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,
-		}
-	);
-}

package/package.json

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