Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(cart): return rule instead of rule_label_map

Browse Source
This commit is contained in:
Sahil Khan 2019-11-07 12:38:05 +05:30
parent 36520ef951
commit 1c44bb0982
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/shopping_cart/cart.py
View File

@ -505,7 +505,7 @@ def get_applicable_shipping_rules(party=None, quotation=None):
if shipping_rules: if shipping_rules:
rule_label_map = frappe.db.get_values("Shipping Rule", shipping_rules, "label") rule_label_map = frappe.db.get_values("Shipping Rule", shipping_rules, "label")
# we need this in sorted order as per the position of the rule in the settings page # we need this in sorted order as per the position of the rule in the settings page
return [[rule, rule_label_map.get(rule)] for rule in shipping_rules] return [[rule, rule] for rule in shipping_rules]
def get_shipping_rules(quotation=None, cart_settings=None): def get_shipping_rules(quotation=None, cart_settings=None):
if not quotation: if not quotation:
@ -563,4 +563,4 @@ def apply_coupon_code(applied_code,applied_referral_sales_partner):
frappe.throw(_("Please enter valid coupon code !!")) frappe.throw(_("Please enter valid coupon code !!"))
else: else:
frappe.throw(_("Please enter coupon code !!")) frappe.throw(_("Please enter coupon code !!"))
return quotation return quotation