From e0143e081c43639d853fef8341c7611a9906f0ac Mon Sep 17 00:00:00 2001 From: Sun Howwrongbum Date: Sat, 29 Jun 2019 20:48:27 +0530 Subject: [PATCH] fix(pos): loyalty details not rendering in cart area --- erpnext/accounts/doctype/loyalty_program/loyalty_program.py | 2 +- erpnext/selling/page/point_of_sale/point_of_sale.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/loyalty_program.py index d840304795f..2b68624f59f 100644 --- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.py @@ -38,7 +38,7 @@ def get_loyalty_details(customer, loyalty_program, expiry_date=None, company=Non @frappe.whitelist() def get_loyalty_program_details_with_points(customer, loyalty_program=None, expiry_date=None, company=None, silent=False, include_expired_entry=False, current_transaction_amount=0): lp_details = get_loyalty_program_details(customer, loyalty_program, company=company, silent=silent) - loyalty_program = frappe.get_doc("Loyalty Program", loyalty_program) + loyalty_program = frappe.get_doc("Loyalty Program", loyalty_program or lp_details.loyalty_program) lp_details.update(get_loyalty_details(customer, loyalty_program.name, expiry_date, company, include_expired_entry)) tier_spent_level = sorted([d.as_dict() for d in loyalty_program.collection_rules], diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js index a16a77f1340..ac1a9fa6fc7 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.js +++ b/erpnext/selling/page/point_of_sale/point_of_sale.js @@ -155,7 +155,7 @@ erpnext.pos.PointOfSale = class PointOfSale { var me = this; if (this.frm.doc.customer) { frappe.call({ - method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details", + method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details_with_points", args: { "customer": me.frm.doc.customer, "expiry_date": me.frm.doc.posting_date,