aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #405 from deaspo/fixing3591

Browse source 
Fix for Task 3591
This commit is contained in:
Polycarp Okock 2017-07-20 22:06:22 +03:00 • committed by GitHub
commit f310c20771
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -35,7 +35,7 @@
<address> <address>
<h3><b>{% trans "Billed To:"%}</b></h3> <h3><b>{% trans "Billed To:"%}</b></h3>
{% with request.session.billing_address_data as billing_address %} {% with request.session.billing_address_data as billing_address %}
{{request.session.user.name}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br> {{billing_address|get_value_from_dict:'cardholder_name'}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
{{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}. {{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
{% endwith %} {% endwith %}
</address> </address>

1
datacenterlight/views.py
View file

@ -343,6 +343,7 @@ class PaymentOrderView(FormView):
if billing_address_data: if billing_address_data:
form_kwargs.update({ form_kwargs.update({
'initial': { 'initial': {
'cardholder_name': billing_address_data['cardholder_name'],
'street_address': billing_address_data['street_address'], 'street_address': billing_address_data['street_address'],
'city': billing_address_data['city'], 'city': billing_address_data['city'],
'postal_code': billing_address_data['postal_code'], 'postal_code': billing_address_data['postal_code'],