http://www.panticz.de/sites/default/files/magento/salutation/Abstract.php.salutation.diff
--- ./app/code/core/Mage/Customer/Model/Address/Abstract.php.org 2011-01-24 16:10:06.000000000 +0100
+++ ./app/code/core/Mage/Customer/Model/Address/Abstract.php 2011-01-24 16:10:30.000000000 +0100
@@ -53,14 +53,14 @@
if ($this->getPrefix()) {
$name .= $this->getPrefix() . ' ';
}
+ if ($this->getSuffix()) {
+ $name .= $this->getSuffix() . ' ';
+ }
$name .= $this->getFirstname();
if ($this->getMiddlename()) {
$name .= ' ' . $this->getMiddlename();
}
$name .= ' ' . $this->getLastname();
- if ($this->getSuffix()) {
- $name .= ' ' . $this->getSuffix();
- }
return $name;
}
http://www.panticz.de/sites/default/files/magento/salutation/Customer.php.salutation.diff
--- ./app/code/core/Mage/Customer/Model/Customer.php.org 2011-01-19 14:49:48.000000000 +0100
+++ ./app/code/core/Mage/Customer/Model/Customer.php 2011-01-19 16:39:12.000000000 +0100
@@ -182,14 +182,14 @@
if ($this->getPrefix()) {
$name .= $this->getPrefix() . ' ';
}
+ if ($this->getSuffix()) {
+ $name .= $this->getSuffix() . ' ';
+ }
$name .= $this->getFirstname();
if ($this->getMiddlename()) {
$name .= ' ' . $this->getMiddlename();
}
$name .= ' ' . $this->getLastname();
- if ($this->getSuffix()) {
- $name .= ' ' . $this->getSuffix();
- }
return $name;
}
http://www.panticz.de/sites/default/files/magento/salutation/config.xml.salutation.diff
--- ./app/code/core/Mage/Customer/etc/config.xml.org 2011-01-25 12:35:25.000000000 +0100
+++ ./app/code/core/Mage/Customer/etc/config.xml 2011-01-25 12:53:54.000000000 +0100
@@ -101,7 +101,7 @@
<text translate="title" module="customer">
<title>Text</title>
<defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}
{{depend company}}{{var company}}{{/depend}}
{{if street1}}{{var street1}}
{{/if}}
@@ -118,14 +118,14 @@
<title>Text One Line</title>
<htmlEscape>true</htmlEscape>
<defaultFormat>
-<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
+<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
</defaultFormat>
</oneline>
<html translate="title" module="customer">
<title>HTML</title>
<htmlEscape>true</htmlEscape>
<defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}<br/>
{{depend company}}{{var company}}<br />{{/depend}}
{{if street1}}{{var street1}}<br />{{/if}}
{{depend street2}}{{var street2}}<br />{{/depend}}
@@ -140,7 +140,7 @@
<pdf translate="title" module="customer">
<title>PDF</title>
<defaultFormat><![CDATA[
-{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
+{{depend prefix}}{{var prefix}} {{/depend}}{{depend suffix}}{{var suffix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}|
{{depend company}}{{var company}}|{{/depend}}
{{if street1}}{{var street1}}
{{/if}}
@@ -155,7 +155,7 @@
</pdf>
<js_template template="title" module="customer">
<title>Javascript Template</title>
- <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
+ <defaultFormat><![CDATA[#{prefix} #{suffix} #{firstname} #{middlename} #{lastname}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
</js_template>
</formats>
</address>
OPTIONAL: fix address block
http://www.panticz.de/sites/default/files/magento/salutation/config.xml.address.diff
--- ./app/code/core/Mage/Customer/etc/config.xml.org 2011-01-25 12:35:25.000000000 +0100
+++ ./app/code/core/Mage/Customer/etc/config.xml 2011-01-25 16:22:52.000000000 +0100
@@ -108,17 +108,17 @@
{{depend street2}}{{var street2}}{{/depend}}
{{depend street3}}{{var street3}}{{/depend}}
{{depend street4}}{{var street4}}{{/depend}}
-{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}
{{var country}}
-T: {{var telephone}}
-{{depend fax}}F: {{var fax}}{{/depend}}
+Tel: {{var telephone}}
+{{depend fax}}Fax: {{var fax}}{{/depend}}
]]></defaultFormat>
</text>
<oneline translate="title" module="customer">
<title>Text One Line</title>
<htmlEscape>true</htmlEscape>
<defaultFormat>
-<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
+<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var postcode}} {{var city}}, {{var region}}, {{var country}}]]>
</defaultFormat>
</oneline>
<html translate="title" module="customer">
@@ -131,10 +131,10 @@
{{depend street2}}{{var street2}}<br />{{/depend}}
{{depend street3}}{{var street3}}<br />{{/depend}}
{{depend street4}}{{var street4}}<br />{{/depend}}
-{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}<br/>
{{var country}}<br/>
-{{depend telephone}}T: {{var telephone}}{{/depend}}
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}
+{{depend telephone}}Tel: {{var telephone}}{{/depend}}
+{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}
]]></defaultFormat>
</html>
<pdf translate="title" module="customer">
@@ -147,15 +147,15 @@
{{depend street2}}{{var street2}}|{{/depend}}
{{depend street3}}{{var street3}}|{{/depend}}
{{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}|
{{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
+{{depend telephone}}Tel: {{var telephone}}{{/depend}}|
+{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}|
]]></defaultFormat>
</pdf>
<js_template template="title" module="customer">
<title>Javascript Template</title>
- <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
+ <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{postcode}, #{city}, #{region}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
</js_template>
</formats>
</address>
Links
http://www.magentocommerce.com/boards/v../viewthread/37850/P0/
http://www.magentocommerce.com/boards/viewthread/176907/#t224666
http://www.magentocommerce.com/magento-connect/mxperts/extension/1603/mxperts--customeraddress