Skip to content

MAGETWO-59112 Backport 2.1.x #13896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 5, 2018
Merged

MAGETWO-59112 Backport 2.1.x #13896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
abd2402
Update config.xml
Ctucker9233 Feb 28, 2018
b19a484
Merge pull request #1 from Ctucker9233/Ctucker9233-Backport-Magetwo-5…
Ctucker9233 Feb 28, 2018
900b46a
Update DefaultRendererTest.php
Ctucker9233 Mar 1, 2018
443818b
Update AddToCartCrossSellTest.xml
Ctucker9233 Mar 1, 2018
19cf917
Update NavigateRelatedProductsTest.xml
Ctucker9233 Mar 1, 2018
2d37305
Update NavigateUpSellProductsTest.xml
Ctucker9233 Mar 1, 2018
0b9e7ea
Update FormTest.php
Ctucker9233 Mar 1, 2018
febee6e
Update AddToCartCrossSellTest.xml
Ctucker9233 Mar 1, 2018
1cafd7c
Update NavigateRelatedProductsTest.xml
Ctucker9233 Mar 1, 2018
0e97647
Update NavigateUpSellProductsTest.xml
Ctucker9233 Mar 1, 2018
c790422
Merge pull request #4 from Ctucker9233/Ctucker9233-patch-2
Ctucker9233 Mar 1, 2018
adb3020
Update AddToCartCrossSellTest.xml
Ctucker9233 Mar 4, 2018
fefdabe
Update NavigateUpSellProductsTest.xml
Ctucker9233 Mar 4, 2018
71e9d15
Update FormTest.php
Ctucker9233 Mar 4, 2018
d19a257
removed stable:no tag
Ctucker9233 Mar 4, 2018
5d07e6e
removed skip test
Ctucker9233 Mar 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions app/code/Magento/Customer/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,15 @@ T: {{var telephone}}
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
{{depend company}}{{var company}}|{{/depend}}
{{if street1}}{{var street1}}
{{/if}}
{{if street1}}{{var street1}}|{{/if}}
{{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 city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
{{var country}}|
{{depend telephone}}T: {{var telephone}}{{/depend}}|
{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
{{depend telephone}}T: {{var telephone}}|{{/depend}}
{{depend fax}}F: {{var fax}}|{{/depend}}|
{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}|]]></pdf>
</address_templates>
</customer>
<general>
Expand Down
4 changes: 2 additions & 2 deletions ...sts/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function renderArrayDataProvider()
[
$addressAttributes,
AttributeDataFactory::OUTPUT_FORMAT_PDF,
"John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
"John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
],
[
$addressAttributes,
Expand Down Expand Up @@ -112,7 +112,7 @@ public function renderDataProvider()
[
$address,
AttributeDataFactory::OUTPUT_FORMAT_PDF,
"John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|
"John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|
United States|\nT: 3468676|\n|\n|"
],
[
Expand Down