CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 01:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: coupon code validation logic

Browse Source 
(cherry picked from commit d04257a32d)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/utils.py
This commit is contained in:
bhaveshkumar.j
2024-10-21 18:22:30 +00:00
committed by Mergify
parent f51c511bcc
commit aeaadb1e30
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/pricing_rule/utils.py
View File

@@ -728,6 +728,7 @@ def get_pricing_rule_items(pr_doc, other_items=False) -> list:
def validate_coupon_code(coupon_name): def validate_coupon_code(coupon_name):
coupon = frappe.get_doc("Coupon Code", coupon_name) coupon = frappe.get_doc("Coupon Code", coupon_name)
<<<<<<< HEAD
if coupon.valid_from: if coupon.valid_from:
if coupon.valid_from > getdate(today()): if coupon.valid_from > getdate(today()):
@@ -736,9 +737,17 @@ def validate_coupon_code(coupon_name):
if coupon.valid_upto < getdate(today()): if coupon.valid_upto < getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has expired")) frappe.throw(_("Sorry, this coupon code's validity has expired"))
elif coupon.used >= coupon.maximum_use: elif coupon.used >= coupon.maximum_use:
=======
if coupon.valid_from and coupon.valid_from > getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has not started"))
elif coupon.valid_upto and coupon.valid_upto < getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has expired"))
elif coupon.maximum_use and coupon.used >= coupon.maximum_use:
>>>>>>> d04257a32d (fix: coupon code validation logic)
frappe.throw(_("Sorry, this coupon code is no longer valid")) frappe.throw(_("Sorry, this coupon code is no longer valid"))
def update_coupon_code_count(coupon_name, transaction_type): def update_coupon_code_count(coupon_name, transaction_type):
coupon = frappe.get_doc("Coupon Code", coupon_name) coupon = frappe.get_doc("Coupon Code", coupon_name)
if coupon: if coupon: