Skip to content

exclude active freebie items from product kit discount calculation #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitorrgg wants to merge 3 commits into
base: main
Choose a base branch
from
Open

exclude active freebie items from product kit discount calculation #703

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
146960f
considering tiny product price list
vitorrgg Feb 4, 2026
d25d1c9
ignoring freebies quantities and prices on kits discounts
vitorrgg Feb 25, 2026
e493d66
Merge branch 'main' into freebie-kit
vitorrgg Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions packages/apps/discounts/lib-mjs/apply-discount.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,14 +280,25 @@ export default async ({ params, application }) => {
return kitDiscount;
});
}
const itemsForKit = params.items.filter((item) => {
return !item.flags?.includes('freebie');
});
Comment on lines -283 to -285
Copy link
Member

@leomp12 leomp12 Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mas você tem alguma evidência de brinde chegando sem a flag? 🤔

const kitDiscounts = getValidDiscountRules(
config.product_kit_discounts,
params,
itemsForKit,
)
const freebieProductIds = [];
if (Array.isArray(config.freebies_rules)) {
config.freebies_rules.forEach((rule) => {
if (
validateDateRange(rule)
&& validateCustomerId(rule, params)
&& Array.isArray(rule.product_ids)
&& matchFreebieRule(rule, params)
) {
rule.product_ids.forEach((id) => {
if (!freebieProductIds.includes(id)) freebieProductIds.push(id);
});
}
});
}
const kitEligibleItems = freebieProductIds.length
? params.items.filter((item) => !freebieProductIds.includes(item.product_id))
: params.items;
const kitDiscounts = getValidDiscountRules(config.product_kit_discounts, params, kitEligibleItems)
.sort((a, b) => {
if (!Array.isArray(a.product_ids) || !a.product_ids.length) {
if (Array.isArray(b.product_ids) && b.product_ids.length) {
Expand Down Expand Up @@ -339,7 +350,9 @@ export default async ({ params, application }) => {
}
// eslint-disable-next-line no-loop-func
kitItems = kitItems.filter((item) => {
return item.quantity && discountedItemIds.indexOf(item.product_id) === -1;
return item.quantity
&& discountedItemIds.indexOf(item.product_id) === -1
&& !freebieProductIds.includes(item.product_id);
});
if (!kitItems.length) {
continue;
Expand Down
Loading