Skip to content
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

fix: only highest eligible coupon applied #38416

Merged
merged 5 commits into from
Dec 6, 2023
Merged

fix: only highest eligible coupon applied #38416

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc70b97
fix: application of pricing rule when coupon is used
sandratridz Nov 29, 2023
ec53c16
Merge branch 'frappe:develop' into fix-pricing-rule-discount
esafwan Nov 29, 2023
09fa8d8
Update erpnext/accounts/doctype/pricing_rule/utils.py
sandratridz Dec 1, 2023
c33b89a
Update erpnext/accounts/doctype/pricing_rule/utils.py
sandratridz Dec 1, 2023
b454560
Merge branch 'develop' into fix-pricing-rule-discount
sandratridz Dec 6, 2023
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
11 changes: 11 additions & 0 deletions erpnext/accounts/doctype/pricing_rule/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ def apply_pricing_rule_on_transaction(doc):
if d.price_or_product_discount == "Price":
if d.apply_discount_on:
doc.set("apply_discount_on", d.apply_discount_on)
# Variable to track whether the condition has been met
condition_met = False

for field in ["additional_discount_percentage", "discount_amount"]:
pr_field = "discount_percentage" if field == "additional_discount_percentage" else field
Expand All @@ -603,6 +605,11 @@ def apply_pricing_rule_on_transaction(doc):
if coupon_code_pricing_rule == d.name:
# if selected coupon code is linked with pricing rule
doc.set(field, d.get(pr_field))

# Set the condition_met variable to True and break out of the loop
condition_met = True
break

else:
# reset discount if not linked
doc.set(field, 0)
Expand All @@ -611,6 +618,10 @@ def apply_pricing_rule_on_transaction(doc):
doc.set(field, 0)

doc.calculate_taxes_and_totals()

# Break out of the main loop if the condition is met
if condition_met:
break
elif d.price_or_product_discount == "Product":
item_details = frappe._dict({"parenttype": doc.doctype, "free_item_data": []})
get_product_discount_rule(d, item_details, doc=doc)
Expand Down