nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-22 10:15:28 +05:30
parent 50dd8d9df7
commit 853ca1fcee
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,22 +728,11 @@ 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 > getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has not started"))
elif coupon.valid_upto:
if coupon.valid_upto < getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has expired"))
elif coupon.used >= coupon.maximum_use:
=======
if coupon.valid_from and coupon.valid_from > getdate(today()): if coupon.valid_from and coupon.valid_from > getdate(today()):
frappe.throw(_("Sorry, this coupon code's validity has not started")) frappe.throw(_("Sorry, this coupon code's validity has not started"))
elif coupon.valid_upto and coupon.valid_upto < getdate(today()): elif coupon.valid_upto and 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.maximum_use and coupon.used >= coupon.maximum_use: 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"))