Merge branch 'master' of github.com:thelia/thelia

Conflicts: templates/admin/default/customer-edit.html
2013-10-28 15:41:48 +01:00
parent c1e792d5b1 9c89bed23d
commit 23c4a14d2c
18 changed files with 1295 additions and 203 deletions
--- a/templates/admin/default/customer-edit.html
+++ b/templates/admin/default/customer-edit.html
@@ -161,6 +161,10 @@
                                                                        {$ADDRESS1}
                                                                        {if $ADDRESS2}<br />{$ADDRESS2}{/if}
                                                                        {if $ADDRESS3}<br />{$ADDRESS3}{/if}
+                                                                        <br>{$ZIPCODE} {$CITY}
+                                                                        {loop name="address.country" type="country" id=$COUNTRY}
+                                                                            <br>{$TITLE}
+                                                                        {/loop}
                                                                        {if $PHONE}
                                                                            <br> <abbr title="{intl l="Phone"}">P:</abbr>{$PHONE}
                                                                        {/if}