Skip to content

Commit e0bb933

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-58924-just-UrlRewriteMap-develop-final
2 parents ef10316 + 18a58db commit e0bb933

File tree

9 files changed

+38
-15
lines changed

9 files changed

+38
-15
lines changed

‎app/code/Magento/Customer/etc/config.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,15 @@ T: {{var telephone}}
8282
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
8383
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
8484
{{depend company}}{{var company}}|{{/depend}}
85-
{{if street1}}{{var street1}}
86-
{{/if}}
85+
{{if street1}}{{var street1}}|{{/if}}
8786
{{depend street2}}{{var street2}}|{{/depend}}
8887
{{depend street3}}{{var street3}}|{{/depend}}
8988
{{depend street4}}{{var street4}}|{{/depend}}
90-
{{if city}}{{var city}},|{{/if}}
91-
{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
89+
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
9290
{{var country}}|
93-
{{depend telephone}}T: {{var telephone}}{{/depend}}|
94-
{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
95-
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
91+
{{depend telephone}}T: {{var telephone}}|{{/depend}}
92+
{{depend fax}}F: {{var fax}}|{{/depend}}|
93+
{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}|]]></pdf>
9694
</address_templates>
9795
</customer>
9896
</default>

‎app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,10 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
395395

396396
if ($putOrderId) {
397397
$page->drawText(__('Order # ') . $order->getRealOrderId(), 35, $top -= 30, 'UTF-8');
398+
$top +=15;
398399
}
400+
401+
$top -=30;
399402
$page->drawText(
400403
__('Order Date: ') .
401404
$this->_localeDate->formatDate(
@@ -408,7 +411,7 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
408411
false
409412
),
410413
35,
411-
$top -= 15,
414+
$top,
412415
'UTF-8'
413416
);
414417

‎app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,15 +492,23 @@
492492
.block-addresses-list {
493493
.items.addresses {
494494
&:extend(.abs-add-clearfix-desktop all);
495+
font-size: 0;
495496

496497
> .item {
497-
&:extend(.abs-blocks-2columns all);
498+
display: inline-block;
499+
font-size: @font-size__base;
498500
margin-bottom: @indent__base;
501+
vertical-align: top;
502+
width: 48.8%;
499503

500504
&:nth-last-child(1),
501505
&:nth-last-child(2) {
502506
margin-bottom: 0;
503507
}
508+
509+
&:nth-child(even) {
510+
margin-left: 2.4%;
511+
}
504512
}
505513
}
506514
}

‎app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@
106106

107107
.box-billing-address,
108108
.box-shipping-address,
109+
.box-address-billing,
110+
.box-address-shipping,
109111
.box-information,
110112
.box-newsletter {
111113
.box-content {
@@ -437,15 +439,23 @@
437439
.block-addresses-list {
438440
.items.addresses {
439441
&:extend(.abs-add-clearfix-desktop all);
442+
font-size: 0;
440443

441444
> .item {
442-
&:extend(.abs-blocks-2columns all);
445+
display: inline-block;
446+
font-size: @font-size__base;
443447
margin-bottom: @indent__base;
448+
vertical-align: top;
449+
width: 48%;
444450

445451
&:nth-last-child(1),
446452
&:nth-last-child(2) {
447453
margin-bottom: 0;
448454
}
455+
456+
&:nth-child(even) {
457+
margin-left: 4%;
458+
}
449459
}
450460
}
451461

@@ -479,6 +489,8 @@
479489

480490
.box-billing-address,
481491
.box-shipping-address,
492+
.box-address-billing,
493+
.box-address-shipping,
482494
.box-information {
483495
.box-content {
484496
&:extend(.abs-account-block-font-size all);

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddToCartCrossSellTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\AddToCartCrossSellTest" summary="Promote Products as Cross-Sells" ticketId="MAGETWO-12390">
1010
<variation name="AddToCartCrossSellTestVariation1" method="test">
11-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
1212
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1313
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
1414
<data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateRelatedProductsTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\NavigateRelatedProductsTest" summary="Promote Products as Related" ticketId="MAGETWO-12392">
1010
<variation name="NavigateRelatedProductsTestVariation1" method="test">
11-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
1212
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1313
<data name="selectable" xsi:type="string">simple1:yes,simple2:yes,config1:no</data>
1414
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\NavigateUpSellProductsTest" summary="Promote Products as Up-Sells" ticketId="MAGETWO-12391">
1010
<variation name="NavigateUpSellProductsTestVariation1" method="test">
11-
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
1212
<data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
1313
<data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
1414
<data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>

‎dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function renderArrayDataProvider()
5656
[
5757
$addressAttributes,
5858
AttributeDataFactory::OUTPUT_FORMAT_PDF,
59-
"John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
59+
"John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|\nUnited States|\nT: 3468676|\n|\n|"
6060
],
6161
[
6262
$addressAttributes,
@@ -112,7 +112,7 @@ public function renderDataProvider()
112112
[
113113
$address,
114114
AttributeDataFactory::OUTPUT_FORMAT_PDF,
115-
"John Smith|\n\nGreen str, 67\n\n\n\n\nCityM,|\nAlabama, 75477|
115+
"John Smith|\n\nGreen str, 67|\n\n\n\nCityM, Alabama, 75477|
116116
United States|\nT: 3468676|\n|\n|"
117117
],
118118
[

‎dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public function testFormPostInitNew($productData, $categoryData, $action, $reque
9696
*/
9797
public function testGetEntityStores($productData, $categoryData, $expectedStores)
9898
{
99+
$this->markTestSkipped('Skipped until MAGETWO-63018');
99100
$args = [];
100101
if ($productData) {
101102
$args['product'] = $this->objectManager->create(
@@ -121,6 +122,7 @@ public function testGetEntityStores($productData, $categoryData, $expectedStores
121122
*/
122123
public function testGetEntityStoresProductStoresException()
123124
{
125+
$this->markTestSkipped('Skipped until MAGETWO-63018');
124126
$args = [
125127
'product' => $this->objectManager->create(
126128
\Magento\Catalog\Model\Product::class,

0 commit comments

Comments
 (0)