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

fix: loyalty test case -> validate against actual database state

Browse Source
This commit is contained in:
David
2024-09-05 14:07:06 +02:00
parent c914ea4adc
commit ad02e4112f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
View File

@@ -80,6 +80,7 @@ class TestLoyaltyProgram(unittest.TestCase):
si_original = create_sales_invoice_record() si_original = create_sales_invoice_record()
si_original.insert() si_original.insert()
si_original.submit() si_original.submit()
customer.reload()
earned_points = get_points_earned(si_original) earned_points = get_points_earned(si_original)
@@ -102,8 +103,8 @@ class TestLoyaltyProgram(unittest.TestCase):
si_redeem.loyalty_points = earned_points si_redeem.loyalty_points = earned_points
si_redeem.insert() si_redeem.insert()
si_redeem.submit() si_redeem.submit()
customer.reload()
customer = frappe.get_doc("Customer", {"customer_name": "Test Loyalty Customer"})
earned_after_redemption = get_points_earned(si_redeem) earned_after_redemption = get_points_earned(si_redeem)
lpe_redeem = frappe.get_doc( lpe_redeem = frappe.get_doc(

3
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -1776,7 +1776,8 @@ class SalesInvoice(SellingController):
loyalty_program=self.loyalty_program, loyalty_program=self.loyalty_program,
include_expired_entry=True, include_expired_entry=True,
) )
frappe.db.set_value("Customer", self.customer, "loyalty_program_tier", lp_details.tier_name) customer = frappe.get_doc("Customer", self.customer)
customer.db_set("loyalty_program_tier", lp_details.tier_name)
def get_returned_amount(self): def get_returned_amount(self):
from frappe.query_builder.functions import Sum from frappe.query_builder.functions import Sum