Merge pull request #8091 from mbauskar/cart-address-fixes
[minor] fixed shipping and billing address issue in cart
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index b427b94..61ec78c 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -31,10 +31,14 @@
doc = quotation
set_cart_count(quotation)
+ addresses = get_address_docs(party=party)
+
return {
"doc": decorate_quotation_doc(doc),
- "addresses": [{"name": address.name, "display": address.display}
- for address in get_address_docs(party=party)],
+ "shipping_addresses": [{"name": address.name, "display": address.display}
+ for address in addresses if address.address_type == "Shipping"],
+ "billing_addresses": [{"name": address.name, "display": address.display}
+ for address in addresses if address.address_type == "Billing"],
"shipping_rules": get_applicable_shipping_rules(party)
}
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index 29d4f4b..d83f609 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -7,7 +7,7 @@
<div class="h6 text-uppercase">{{ _("Shipping Address") }}</div>
<div id="cart-shipping-address" class="panel-group"
data-fieldname="shipping_address_name">
- {% for address in addresses %}
+ {% for address in shipping_addresses %}
{{ show_address(address, doc, "shipping_address_name", select_address) }}
{% endfor %}
</div>
@@ -18,7 +18,7 @@
<div class="h6 text-uppercase">Billing Address</div>
<div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address">
- {% for address in addresses %}
+ {% for address in billing_addresses %}
{{ show_address(address, doc, "customer_address", select_address) }}
{% endfor %}
</div>