@wtree/payload-ecommerce-coupon 3.78.5 → 3.78.7

package/dist/collections/createReferralProgramsCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createReferralProgramsCollection.d.ts","sourceRoot":"","sources":["../../src/collections/createReferralProgramsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AA0B5D,eAAO,MAAM,gCAAgC,GAC3C,cAAc,4BAA4B,KACzC,gBAwZF,CAAA"}
+{"version":3,"file":"createReferralProgramsCollection.d.ts","sourceRoot":"","sources":["../../src/collections/createReferralProgramsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AA+B5D,eAAO,MAAM,gCAAgC,GAC3C,cAAc,4BAA4B,KACzC,gBAgaF,CAAA"}

package/dist/index.js

@@ -423,12 +423,22 @@ const createReferralCodesCollection = (pluginConfig) => {
 	};
 };
 //#endregion
+//#region src/utilities/roundTo2.ts
+/**
+* Rounds a number to 2 decimal places (standard for monetary values).
+*/
+function roundTo2(value) {
+	return Math.round(value * 100) / 100;
+}
+//#endregion
 //#region src/collections/createReferralProgramsCollection.ts
 function toNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
-function toCents(value) {
-	return Math.round(value * 100);
+function normalizeLegacyX100Money(value) {
+	if (value == null) return null;
+	if (Number.isInteger(value) && Math.abs(value) >= 1e3) return roundTo2(value / 100);
+	return value;
 }
 const createReferralProgramsCollection = (pluginConfig) => {
 	const { collections, access, adminGroups, referralConfig, integration } = pluginConfig;
@@ -454,14 +464,14 @@ const createReferralProgramsCollection = (pluginConfig) => {
 		},
 		hooks: { beforeChange: [({ data }) => {
 			if (!data.commissionRules || !Array.isArray(data.commissionRules) || data.commissionRules.length === 0) throw new payload.APIError("At least one commission rule is required", 400);
-			const maxPartnerCommissionPerOrder = toNumber(data.maxPartnerCommissionPerOrder);
+			const maxPartnerCommissionPerOrder = normalizeLegacyX100Money(toNumber(data.maxPartnerCommissionPerOrder));
 			if (maxPartnerCommissionPerOrder != null && maxPartnerCommissionPerOrder < 0) throw new payload.APIError("Maximum commission per order for partner must be a non-negative number", 400);
-			const maxCustomerDiscountPerOrder = toNumber(data.maxCustomerDiscountPerOrder);
+			const maxCustomerDiscountPerOrder = normalizeLegacyX100Money(toNumber(data.maxCustomerDiscountPerOrder));
 			if (maxCustomerDiscountPerOrder != null && maxCustomerDiscountPerOrder < 0) throw new payload.APIError("Maximum discount for customer per order must be a non-negative number", 400);
-			const minOrderAmount = toNumber(data.minOrderAmount);
+			const minOrderAmount = normalizeLegacyX100Money(toNumber(data.minOrderAmount));
 			if (minOrderAmount != null && minOrderAmount < 0) throw new payload.APIError("Minimum Order Amount must be a non-negative number", 400);
-			data.maxPartnerCommissionPerOrder = maxPartnerCommissionPerOrder != null ? toCents(maxPartnerCommissionPerOrder) : null;
-			data.maxCustomerDiscountPerOrder = maxCustomerDiscountPerOrder != null ? toCents(maxCustomerDiscountPerOrder) : null;
+			data.maxPartnerCommissionPerOrder = maxPartnerCommissionPerOrder != null ? maxPartnerCommissionPerOrder : null;
+			data.maxCustomerDiscountPerOrder = maxCustomerDiscountPerOrder != null ? maxCustomerDiscountPerOrder : null;
 			data.minOrderAmount = minOrderAmount ?? null;
 			data.commissionRules = data.commissionRules.map((rule, index) => {
 				const r = rule;
@@ -492,8 +502,8 @@ const createReferralProgramsCollection = (pluginConfig) => {
 					partnerSplit = partnerPctInput;
 					customerSplit = customerPctComputed;
 				} else {
-					const partnerAmountInput = toNumber(r.partnerAmount);
-					const customerAmountInput = toNumber(r.customerAmount);
+					const partnerAmountInput = normalizeLegacyX100Money(toNumber(r.partnerAmount));
+					const customerAmountInput = normalizeLegacyX100Money(toNumber(r.customerAmount));
 					const legacyPartnerSplitInput = toNumber(r.partnerSplit);
 					const legacyCustomerSplitInput = toNumber(r.customerSplit);
 					const hasNewFixedInputs = partnerAmountInput != null || customerAmountInput != null;
@@ -503,8 +513,8 @@ const createReferralProgramsCollection = (pluginConfig) => {
 						if (customerAmountInput == null || customerAmountInput < 0) throw new payload.APIError(`Commission rule ${index + 1}: Customer fixed amount must be a non-negative number`, 400);
 						partnerAmount = partnerAmountInput;
 						customerAmount = customerAmountInput;
-						partnerSplit = toCents(partnerAmountInput);
-						customerSplit = toCents(customerAmountInput);
+						partnerSplit = partnerAmountInput;
+						customerSplit = customerAmountInput;
 					} else if (hasLegacyFixedInputs) {
 						if (legacyPartnerSplitInput == null || legacyPartnerSplitInput < 0) throw new payload.APIError(`Commission rule ${index + 1}: For fixed commissions, both partner and customer values must be non-negative numbers`, 400);
 						const resolvedLegacyCustomerSplit = legacyCustomerSplitInput ?? 100 - legacyPartnerSplitInput;
@@ -518,7 +528,11 @@ const createReferralProgramsCollection = (pluginConfig) => {
 				return {
 					...rule,
 					appliesTo: appliesTo === "categories" ? "segments" : appliesTo,
-					totalCommission: { type },
+					totalCommission: {
+						type,
+						...typeof r.totalCommission.value === "number" ? { value: r.totalCommission.value } : {},
+						...typeof r.totalCommission.maxAmount === "number" ? { maxAmount: r.totalCommission.maxAmount } : {}
+					},
 					partnerPercent,
 					customerPercent,
 					partnerAmount,
@@ -547,19 +561,19 @@ const createReferralProgramsCollection = (pluginConfig) => {
 				name: "maxPartnerCommissionPerOrder",
 				type: "number",
 				min: 0,
-				admin: { description: "Maximum commission per order for partner. Leave empty for no cap. Enter value in currency units (will be converted to cents)." }
+				admin: { description: "Maximum commission per order for partner (normal currency value, ). Leave empty for no cap." }
 			},
 			{
 				name: "maxCustomerDiscountPerOrder",
 				type: "number",
 				min: 0,
-				admin: { description: "Maximum customer discount per order. Leave empty for no cap. Enter value in currency units (will be converted to cents)." }
+				admin: { description: "Maximum customer discount per order (normal currency value, ). Leave empty for no cap." }
 			},
 			{
 				name: "minOrderAmount",
 				type: "number",
 				min: 0,
-				admin: { description: "Minimum cart subtotal required for this program. Leave empty for no minimum." }
+				admin: { description: "Minimum cart subtotal required for this program (normal currency value, ). Leave empty for no minimum." }
 			},
 			{
 				name: "commissionRules",
@@ -659,7 +673,7 @@ const createReferralProgramsCollection = (pluginConfig) => {
 						min: 0,
 						admin: {
 							condition: (_, siblingData) => siblingData?.totalCommission?.type === "fixed",
-							description: "Fixed partner commission amount per item."
+							description: "Fixed partner commission amount per item (normal currency value)."
 						}
 					},
 					{
@@ -668,7 +682,7 @@ const createReferralProgramsCollection = (pluginConfig) => {
 						min: 0,
 						admin: {
 							condition: (_, siblingData) => siblingData?.totalCommission?.type === "fixed",
-							description: "Fixed customer discount amount per item."
+							description: "Fixed customer discount amount per item (normal currency value)."
 						}
 					},
 					{
@@ -677,7 +691,7 @@ const createReferralProgramsCollection = (pluginConfig) => {
 						min: 0,
 						admin: {
 							hidden: true,
-							description: "Canonical storage field. Percentage mode: percent. Fixed mode: amount in cents."
+							description: "Canonical storage field. Percentage mode: percent. Fixed mode: amount."
 						}
 					},
 					{
@@ -686,7 +700,7 @@ const createReferralProgramsCollection = (pluginConfig) => {
 						min: 0,
 						admin: {
 							hidden: true,
-							description: "Canonical storage field. Percentage mode: percent. Fixed mode: amount in cents."
+							description: "Canonical storage field. Percentage mode: percent. Fixed mode: amount."
 						}
 					}
 				]
@@ -695,14 +709,6 @@ const createReferralProgramsCollection = (pluginConfig) => {
 		timestamps: true
 	};
 };
-//#endregion
-//#region src/utilities/roundTo2.ts
-/**
-* Rounds a number to 2 decimal places (standard for monetary values).
-*/
-function roundTo2(value) {
-	return Math.round(value * 100) / 100;
-}
 function normalizeCurrencyCode(currencyCode) {
 	if (!currencyCode) return "AED";
 	return currencyCode.toUpperCase();
@@ -793,15 +799,52 @@ function calculateItemRewardByRule({ rule, itemTotal, quantity, allowedTotalComm
 				customer
 			};
 		}
-		const splits = getRuleSplits(rule);
-		if (!splits) return null;
 		let totalPot = 0;
-		if (rule.totalCommission.type === "percentage") totalPot = itemTotal * rule.totalCommission.value / 100;
-		else totalPot = rule.totalCommission.value * quantity;
+		if (rule.totalCommission.type === "percentage") {
+			const commissionValue = typeof rule.totalCommission.value === "number" && Number.isFinite(rule.totalCommission.value) ? rule.totalCommission.value : null;
+			if (commissionValue == null) {
+				const partnerPercentInput = typeof rule.partnerPercent === "number" ? rule.partnerPercent : typeof rule.partnerSplit === "number" ? rule.partnerSplit : null;
+				if (partnerPercentInput == null || partnerPercentInput < 0 || partnerPercentInput > 100) return null;
+				const customerPercentInput = typeof rule.customerPercent === "number" ? rule.customerPercent : typeof rule.customerSplit === "number" ? rule.customerSplit : 100 - partnerPercentInput;
+				if (customerPercentInput == null || customerPercentInput < 0 || customerPercentInput > 100) return null;
+				const partner = itemTotal * partnerPercentInput / 100;
+				const customer = itemTotal * customerPercentInput / 100;
+				if (resolvedMaxAmount != null) {
+					const maxPotForLine = resolvedMaxAmount * quantity;
+					const totalForLine = partner + customer;
+					if (totalForLine > maxPotForLine && totalForLine > 0) {
+						const ratio = maxPotForLine / totalForLine;
+						return {
+							partner: Math.floor(partner * ratio),
+							customer: Math.floor(customer * ratio)
+						};
+					}
+				}
+				return {
+					partner: Math.floor(partner),
+					customer: Math.floor(customer)
+				};
+			}
+			totalPot = itemTotal * commissionValue / 100;
+		} else {
+			const splits = getRuleSplits(rule);
+			if (!splits) return null;
+			totalPot = rule.totalCommission.value * quantity;
+			if (resolvedMaxAmount != null) {
+				const maxPotForLine = resolvedMaxAmount * quantity;
+				if (totalPot > maxPotForLine) totalPot = maxPotForLine;
+			}
+			return {
+				partner: Math.floor(totalPot * splits.partnerSplit / 100),
+				customer: Math.floor(totalPot * splits.customerSplit / 100)
+			};
+		}
 		if (resolvedMaxAmount != null) {
 			const maxPotForLine = resolvedMaxAmount * quantity;
 			if (totalPot > maxPotForLine) totalPot = maxPotForLine;
 		}
+		const splits = getRuleSplits(rule);
+		if (!splits) return null;
 		return {
 			partner: Math.floor(totalPot * splits.partnerSplit / 100),
 			customer: Math.floor(totalPot * splits.customerSplit / 100)
@@ -886,10 +929,10 @@ function selectBestRuleForItem({ rules, item, itemTotal, quantity, cartTotal, mi
 	return best;
 }
 function getProgramMinimumOrderAmount({ program, allowedTotalCommissionTypes }) {
+	if (typeof program?.minOrderAmount === "number" && Number.isFinite(program.minOrderAmount)) return program.minOrderAmount;
 	const rules = Array.isArray(program?.commissionRules) ? program.commissionRules : [];
 	if (!rules.length) return null;
 	const allowedTypes = allowedCommissionTypesSet(allowedTotalCommissionTypes);
-	if (typeof program?.minOrderAmount === "number" && Number.isFinite(program.minOrderAmount)) return program.minOrderAmount;
 	const minValues = rules.filter((rule) => {
 		if (rule?.totalCommission?.type) return allowedTypes.has(rule.totalCommission.type);
 		return true;