@wtree/payload-ecommerce-coupon 3.78.5 → 3.78.6

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;AAsB5D,eAAO,MAAM,gCAAgC,GAC3C,cAAc,4BAA4B,KACzC,gBA0ZF,CAAA"}

package/dist/index.js

@@ -427,9 +427,6 @@ const createReferralCodesCollection = (pluginConfig) => {
 function toNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
-function toCents(value) {
-	return Math.round(value * 100);
-}
 const createReferralProgramsCollection = (pluginConfig) => {
 	const { collections, access, adminGroups, referralConfig, integration } = pluginConfig;
 	const allowedTotalCommissionTypes = referralConfig.allowedTotalCommissionTypes;
@@ -460,8 +457,8 @@ const createReferralProgramsCollection = (pluginConfig) => {
 			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);
 			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;
@@ -503,8 +500,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 +515,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,13 +548,13 @@ 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. 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. Leave empty for no cap." }
 			},
 			{
 				name: "minOrderAmount",
@@ -677,7 +678,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 +687,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."
 						}
 					}
 				]
@@ -793,15 +794,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)
@@ -836,7 +874,8 @@ function selectBestRuleForItem({ rules, item, itemTotal, quantity, cartTotal, mi
 	const eligibleRules = rules.filter((rule) => {
 		if (!(rule?.totalCommission?.type ? allowedTypes.has(rule.totalCommission.type) : true)) return false;
 		const resolvedMinOrderAmount = typeof minOrderAmount === "number" && Number.isFinite(minOrderAmount) ? minOrderAmount : typeof rule?.minOrderAmount === "number" && Number.isFinite(rule.minOrderAmount) ? rule.minOrderAmount : null;
-		if (resolvedMinOrderAmount != null) return cartTotal >= resolvedMinOrderAmount;
+		const shouldApplyMinOrder = rule?.totalCommission?.type !== "fixed";
+		if (resolvedMinOrderAmount != null && shouldApplyMinOrder) return cartTotal >= resolvedMinOrderAmount;
 		return true;
 	});
 	const productId = relationId$5(item.product);
@@ -889,7 +928,10 @@ function getProgramMinimumOrderAmount({ program, allowedTotalCommissionTypes })
 	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;
+	if (rules.some((rule) => {
+		if (rule?.totalCommission?.type) return rule.totalCommission.type === "percentage" && allowedTypes.has(rule.totalCommission.type);
+		return true;
+	}) && 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;