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

Merge pull request #8091 from mbauskar/cart-address-fixes

Browse Source 
[minor] fixed shipping and billing address issue in cart
This commit is contained in:
Nabin Hait 2017-03-23 16:16:11 +05:30 committed by GitHub
commit b132428184
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/shopping_cart/cart.py
View File

@ -31,10 +31,14 @@ def get_cart_quotation(doc=None):
doc = quotation doc = quotation
set_cart_count(quotation) set_cart_count(quotation)
addresses = get_address_docs(party=party)
return { return {
"doc": decorate_quotation_doc(doc), "doc": decorate_quotation_doc(doc),
"addresses": [{"name": address.name, "display": address.display} "shipping_addresses": [{"name": address.name, "display": address.display}
for address in get_address_docs(party=party)], 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) "shipping_rules": get_applicable_shipping_rules(party)
} }

4
erpnext/templates/includes/cart/cart_address.html
View File

@ -7,7 +7,7 @@
<div class="h6 text-uppercase">{{ _("Shipping Address") }}</div> <div class="h6 text-uppercase">{{ _("Shipping Address") }}</div>
<div id="cart-shipping-address" class="panel-group" <div id="cart-shipping-address" class="panel-group"
data-fieldname="shipping_address_name"> data-fieldname="shipping_address_name">
{% for address in addresses %} {% for address in shipping_addresses %}
{{ show_address(address, doc, "shipping_address_name", select_address) }} {{ show_address(address, doc, "shipping_address_name", select_address) }}
{% endfor %} {% endfor %}
</div> </div>
@ -18,7 +18,7 @@
<div class="h6 text-uppercase">Billing Address</div> <div class="h6 text-uppercase">Billing Address</div>
<div id="cart-billing-address" class="panel-group" <div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address"> data-fieldname="customer_address">
{% for address in addresses %} {% for address in billing_addresses %}
{{ show_address(address, doc, "customer_address", select_address) }} {{ show_address(address, doc, "customer_address", select_address) }}
{% endfor %} {% endfor %}
</div> </div>