sahab-utils 1.2.5 → 1.2.7

package/constants/types.ts

@@ -744,6 +744,7 @@ export type WeatherData = {
 
 export type PaymentConfigs = {
 	isCashAllowed: boolean;
+	isGooglePayAllowed?: boolean;
 	paymentGateways: {
 		key: string;
 		isActive: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sahab-utils",
-	"version": "1.2.5",
+	"version": "1.2.7",
 	"description": "This package containts types and utils fuctions",
 	"main": "index.ts",
 	"scripts": {

package/ts/calcs.ts

@@ -35,14 +35,50 @@ export function getSahabDiscountsAmount(order: Order) {
 		discounts += 0.05 * orderTotal;
 	} else if (order?.promoCode?.amount && order?.promoCode?.amount > 0 && !order?.promoCode?.createdByProvider) {
 		if (order?.promoCode?.isPercentage) {
-			const amount = (preventNaN(order?.promoCode?.amount) / 100) * orderTotal;
+			let amount = (preventNaN(order?.promoCode?.amount) / 100) * orderTotal;
+
+			// Check if promo code is for specific services/addons only
+			if (
+				(order?.promoCode?.servicesIds && order?.promoCode?.servicesIds.length > 0) ||
+				(order?.promoCode?.addonsIds && order?.promoCode?.addonsIds.length > 0)
+			) {
+				let applicableTotal = 0;
+				order?.services?.forEach((carService) => {
+					carService?.services?.forEach((service) => {
+						if (order?.promoCode?.servicesIds?.includes(service?.serviceId || '') || order?.promoCode?.addonsIds?.includes(service?.addonId || '')) {
+							applicableTotal += service?.price?.price || 0;
+						}
+					});
+				});
+
+				amount = (preventNaN(order?.promoCode?.amount) / 100) * applicableTotal;
+			}
+
 			if (order?.promoCode?.maxAmount && order?.promoCode?.maxAmount > 0) {
 				discounts += Math.min(amount, order?.promoCode?.maxAmount);
 			} else {
 				discounts += amount;
 			}
 		} else {
-			const amount = preventNaN(order?.promoCode?.amount);
+			let amount = preventNaN(order?.promoCode?.amount);
+
+			// Check if promo code is for specific services/addons only
+			if (
+				(order?.promoCode?.servicesIds && order?.promoCode?.servicesIds.length > 0) ||
+				(order?.promoCode?.addonsIds && order?.promoCode?.addonsIds.length > 0)
+			) {
+				let applicableTotal = 0;
+				order?.services?.forEach((carService) => {
+					carService?.services?.forEach((service) => {
+						if (order?.promoCode?.servicesIds?.includes(service?.serviceId || '') || order?.promoCode?.addonsIds?.includes(service?.addonId || '')) {
+							applicableTotal += service?.price?.price || 0;
+						}
+					});
+				});
+
+				amount = Math.min(amount, applicableTotal);
+			}
+
 			if (order?.promoCode?.maxAmount && order?.promoCode?.maxAmount > 0) {
 				discounts += Math.min(amount, order?.promoCode?.maxAmount);
 			} else {
@@ -58,6 +94,19 @@ export function getSahabDiscountsAmount(order: Order) {
 
 			if (sahabDiscounts.length) {
 				sahabDiscounts.forEach((discount) => {
+					// Check if discount is for specific services/addons only
+					if (discount?.servicesIds && discount?.servicesIds.length > 0) {
+						if (!discount?.servicesIds?.includes(service?.serviceId || '')) {
+							return;
+						}
+					}
+
+					if (discount?.addonsIds && discount?.addonsIds.length > 0) {
+						if (!discount?.addonsIds?.includes(service?.addonId || '')) {
+							return;
+						}
+					}
+
 					if (discount?.isPercentage) {
 						discounts += (preventNaN(discount?.amount ?? 0) / 100) * (service?.price?.price ?? 0);
 					} else {
@@ -87,14 +136,49 @@ export function getProviderDiscountsAmount(order: Order) {
 		discounts += 0.05 * orderTotal;
 	} else if (order?.promoCode?.amount && order?.promoCode?.amount > 0 && order?.promoCode?.createdByProvider) {
 		if (order?.promoCode?.isPercentage) {
-			const amount = (preventNaN(order?.promoCode?.amount) / 100) * orderTotal;
+			let amount = (preventNaN(order?.promoCode?.amount) / 100) * orderTotal;
+
+			// Check if promo code is for specific services/addons only
+			if (
+				(order?.promoCode?.servicesIds && order?.promoCode?.servicesIds.length > 0) ||
+				(order?.promoCode?.addonsIds && order?.promoCode?.addonsIds.length > 0)
+			) {
+				let applicableTotal = 0;
+				order?.services?.forEach((carService) => {
+					carService?.services?.forEach((service) => {
+						if (order?.promoCode?.servicesIds?.includes(service?.serviceId || '') || order?.promoCode?.addonsIds?.includes(service?.addonId || '')) {
+							applicableTotal += service?.price?.price || 0;
+						}
+					});
+				});
+
+				amount = (preventNaN(order?.promoCode?.amount) / 100) * applicableTotal;
+			}
+
 			if (order?.promoCode?.maxAmount && order?.promoCode?.maxAmount > 0) {
 				discounts += Math.min(amount, order?.promoCode?.maxAmount);
 			} else {
 				discounts += amount;
 			}
 		} else {
-			const amount = preventNaN(order?.promoCode?.amount);
+			let amount = preventNaN(order?.promoCode?.amount);
+
+			// Check if promo code is for specific services/addons only
+			if (
+				(order?.promoCode?.servicesIds && order?.promoCode?.servicesIds.length > 0) ||
+				(order?.promoCode?.addonsIds && order?.promoCode?.addonsIds.length > 0)
+			) {
+				let applicableTotal = 0;
+				order?.services?.forEach((carService) => {
+					carService?.services?.forEach((service) => {
+						if (order?.promoCode?.servicesIds?.includes(service?.serviceId || '') || order?.promoCode?.addonsIds?.includes(service?.addonId || '')) {
+							applicableTotal += service?.price?.price || 0;
+						}
+					});
+				});
+
+				amount = Math.min(amount, applicableTotal);
+			}
 
 			if (order?.promoCode?.maxAmount && order?.promoCode?.maxAmount > 0) {
 				discounts += Math.min(amount, order?.promoCode?.maxAmount);
@@ -110,6 +194,19 @@ export function getProviderDiscountsAmount(order: Order) {
 
 			if (sahabDiscounts.length) {
 				sahabDiscounts.forEach((discount) => {
+					// Check if discount is for specific services/addons only
+					if (discount?.servicesIds && discount?.servicesIds.length > 0) {
+						if (!discount?.servicesIds?.includes(service?.serviceId || '')) {
+							return;
+						}
+					}
+
+					if (discount?.addonsIds && discount?.addonsIds.length > 0) {
+						if (!discount?.addonsIds?.includes(service?.addonId || '')) {
+							return;
+						}
+					}
+
 					if (discount?.isPercentage) {
 						discounts += (preventNaN(discount?.amount ?? 0) / 100) * (service?.price?.price ?? 0);
 					} else {
@@ -231,66 +328,6 @@ export function calculatePromoCodeAmount(order: Order) {
 	return preventNaN(order?.promoCode?.amount);
 }
 
-export function calculateDiscountAmount(order: Order) {
-	let discounts = 0;
-
-	if (!order?.promoCode?.amount && !order?.services?.some((service) => service?.services?.some((s) => s?.discount))) {
-		return 0;
-	}
-
-	const orderTotal = getServicesTotal(order);
-	if (order?.promoCode?.isPercentage) {
-		discounts += (preventNaN(order?.promoCode?.amount ?? 0) / 100) * orderTotal;
-	} else if (order?.promoCode?.amount) {
-		discounts += preventNaN(order?.promoCode?.amount ?? 0);
-	}
-
-	if (order?.services?.some((service) => service?.services?.some((s) => s?.discount))) {
-		(order?.services ?? [])?.forEach((carService) => {
-			(carService?.services || []).forEach((service) => {
-				let sahabDiscounts = [service?.discount] as Discount[];
-
-				if (sahabDiscounts.length) {
-					sahabDiscounts.forEach((discount) => {
-						if (discount?.isPercentage) {
-							discounts += (preventNaN(discount?.amount ?? 0) / 100) * (service?.price?.price ?? 0);
-						} else {
-							discounts += preventNaN(discount?.amount ?? 0);
-						}
-					});
-				}
-			});
-		});
-	}
-
-	return discounts;
-}
-
-export function getServiceTotal(providedService: ProvidedService | ProvidedAddon) {
-	let total = 0;
-
-	total += providedService?.price?.price ?? 0;
-	let sahabDiscounts = [providedService?.discount] as Discount[];
-
-	if (sahabDiscounts.length) {
-		sahabDiscounts.forEach((discount) => {
-			if (discount?.isPercentage) {
-				total -= (preventNaN(discount?.amount ?? 0) / 100) * (providedService?.price?.price ?? 0);
-			} else {
-				total -= preventNaN(discount?.amount ?? 0);
-			}
-		});
-	}
-
-	if (total < 0) {
-		total = 0;
-	}
-
-	const clientPercentage = 0.03 * total;
-
-	return total + clientPercentage;
-}
-
 export function calculateOrderPercentage({
 	isPaid,
 	paymentId,