Skip to content

Commit ea73279

Browse files
VladimirZaetsVladimirZaets
authored
Merge pull request #4887 from magento-engcom/2.3-develop-expedited-prs
[Magento Community Engineering] Community Contributions - 2.3-develop expedited
2 parents 14d6388 + ec70c7f commit ea73279

File tree

13 files changed

+197
-41
lines changed

13 files changed

+197
-41
lines changed

‎app/code/Magento/CatalogUrlRewrite/Model/Storage/DynamicStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private function getCategoryUrlSuffix($storeId = null): string
148148
CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
149149
ScopeInterface::SCOPE_STORE,
150150
$storeId
151-
);
151+
) ?? '';
152152
}
153153

154154
/**

‎app/code/Magento/Directory/Setup/Patch/Data/AddCountriesCaribbeanCuracaoKosovoSintMaarten.php

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Directory\Setup\Patch\Data;
10+
11+
use Magento\Framework\Setup\ModuleDataSetupInterface;
12+
use Magento\Framework\Setup\Patch\DataPatchInterface;
13+
14+
/**
15+
* Class AddCountriesCaribbeanCuracaoKosovoSintMaarten
16+
*
17+
* @package Magento\Directory\Setup\Patch
18+
*/
19+
class AddCountriesCaribbeanCuracaoKosovoSintMaarten implements DataPatchInterface
20+
{
21+
/**
22+
* @var ModuleDataSetupInterface
23+
*/
24+
private $moduleDataSetup;
25+
26+
/**
27+
* AddCountriesCaribbeanCuracaoKosovoSintMaarten constructor.
28+
* @param ModuleDataSetupInterface $moduleDataSetup
29+
*/
30+
public function __construct(
31+
ModuleDataSetupInterface $moduleDataSetup
32+
) {
33+
$this->moduleDataSetup = $moduleDataSetup;
34+
}
35+
36+
/**
37+
* @inheritdoc
38+
*/
39+
public function apply()
40+
{
41+
/**
42+
* Fill table directory/country
43+
*/
44+
$data = [
45+
[
46+
'country_id' => 'BQ',
47+
'iso2_code' => 'BQ',
48+
'iso3_code' => 'BES',
49+
],
50+
[
51+
'country_id' => 'CW',
52+
'iso2_code' => 'CW',
53+
'iso3_code' => 'CUW',
54+
],
55+
[
56+
'country_id' => 'SX',
57+
'iso2_code' => 'SX',
58+
'iso3_code' => 'SXM',
59+
],
60+
[
61+
'country_id' => 'XK',
62+
'iso2_code' => 'XK',
63+
'iso3_code' => 'XKX',
64+
],
65+
];
66+
67+
$this->moduleDataSetup->getConnection()->insertOnDuplicate(
68+
$this->moduleDataSetup->getTable('directory_country'),
69+
$data
70+
);
71+
}
72+
73+
/**
74+
* @inheritdoc
75+
*/
76+
public static function getDependencies()
77+
{
78+
return [
79+
InitializeDirectoryData::class
80+
];
81+
}
82+
83+
/**
84+
* @inheritdoc
85+
*/
86+
public function getAliases()
87+
{
88+
return [];
89+
}
90+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<general>
3737
<country>
3838
<optional_zip_countries>HK,IE,MO,PA,GB</optional_zip_countries>
39-
<allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW</allow>
39+
<allow>AF,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AX,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BL,BT,BO,BQ,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CD,CV,KY,CF,TD,CL,CN,CX,CW,CC,CO,KM,CG,CK,CR,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GG,GH,GI,GR,GL,GD,GP,GU,GT,GN,GW,GY,HT,HM,HN,HK,HU,IS,IM,IN,ID,IR,IQ,IE,IL,IT,CI,JE,JM,JP,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,ME,MF,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,FX,MX,FM,MD,MC,MN,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,KP,MP,NO,OM,PK,PW,PA,PG,PY,PE,PH,PN,PL,PS,PT,PR,QA,RE,RO,RS,RU,RW,SH,KN,LC,PM,VC,WS,SM,ST,SA,SN,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,SD,SR,SJ,SZ,SE,CH,SX,SY,TL,TW,TJ,TZ,TH,TG,TK,TO,TT,TN,TR,TM,TC,TV,VI,UG,UA,AE,GB,US,UM,UY,UZ,VU,VA,VE,VN,WF,EH,XK,YE,ZM,ZW</allow>
4040
<default>US</default>
4141
</country>
4242
<locale>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCreateOrderAddProductCheckboxTest">
12+
<annotations>
13+
<title value="Create Order in Admin and Add Product"/>
14+
<stories value="Create order and add product using checkbox"/>
15+
<description value="Create order in Admin panel, add product by clicking checkbox, and verify it is checked"/>
16+
<features value="Sales"/>
17+
<severity value="AVERAGE"/>
18+
<group value="Sales"/>
19+
</annotations>
20+
21+
<before>
22+
<!-- Create simple customer -->
23+
<createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer"/>
24+
25+
<!-- Create simple product -->
26+
<createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
27+
28+
<!-- Login to Admin Panel -->
29+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
30+
</before>
31+
32+
<!-- Initiate create new order -->
33+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderWithExistingCustomer">
34+
<argument name="customer" value="$$createSimpleCustomer$$"/>
35+
</actionGroup>
36+
37+
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
38+
<fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSkuFilterBundle"/>
39+
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/>
40+
<scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
41+
<checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
42+
<seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked"/>
43+
44+
<after>
45+
<actionGroup ref="logout" stepKey="logout"/>
46+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
47+
<deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/>
48+
</after>
49+
</test>
50+
</tests>

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
position: relative;
2323
display: -webkit-inline-flex;
2424
display: -ms-inline-flexbox;
25+
display: inline-flex;
2526
-webkit-flex-direction: row;
2627
-ms-flex-direction: row;
2728
flex-direction: row;
28-
display: inline-flex;
2929
flex-flow: row nowrap;
3030
width: 100%;
3131

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,23 @@
308308
}
309309
}
310310

311+
//
312+
// Create Order - Add Product Grid
313+
// ---------------------------------------------
314+
315+
#sales_order_create_search_grid {
316+
.col-in_products {
317+
.data-grid-checkbox-cell-inner {
318+
position: relative;
319+
}
320+
.checkbox {
321+
width: 1.6rem;
322+
height: 1.6rem;
323+
left: 0;
324+
right: 0;
325+
margin: auto;
326+
}
327+
}
328+
}
329+
311330
// ToDo: MAGETWO-32299 UI: review the collapsible block

‎app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4070,6 +4070,21 @@
40704070
}
40714071
}
40724072

4073+
.adminhtml-email_template-preview {
4074+
.cms-revision-preview {
4075+
padding-top: 56.25%;
4076+
position: relative;
4077+
4078+
#preview_iframe {
4079+
height: 100%;
4080+
left: 0;
4081+
position: absolute;
4082+
top: 0;
4083+
width: 100%;
4084+
}
4085+
}
4086+
}
4087+
40734088
.admin__scope-old {
40744089
.buttons-set {
40754090
margin: 0 0 15px;

‎dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,9 +769,21 @@ public function testConfirmationEmailWithSpecialCharacters(): void
769769
$message = $this->transportBuilderMock->getSentMessage();
770770
$rawMessage = $message->getRawMessage();
771771

772-
$this->assertContains('To: John Smith <' . $email . '>', $rawMessage);
772+
/** @var \Zend\Mime\Part $messageBodyPart */
773+
$messageBodyParts = $message->getBody()->getParts();
774+
$messageBodyPart = reset($messageBodyParts);
775+
$messageEncoding = $messageBodyPart->getCharset();
776+
$name = 'John Smith';
777+
778+
if (strtoupper($messageEncoding) !== 'ASCII') {
779+
$name = \Zend\Mail\Header\HeaderWrap::mimeEncodeValue($name, $messageEncoding);
780+
}
781+
782+
$nameEmail = sprintf('%s <%s>', $name, $email);
783+
784+
$this->assertContains('To: ' . $nameEmail, $rawMessage);
773785

774-
$content = $message->getBody()->getParts()[0]->getRawContent();
786+
$content = $messageBodyPart->getRawContent();
775787
$confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
776788
$this->setRequestInfo($confirmationUrl, 'confirm');
777789
$this->clearCookieMessagesList();

‎dev/tests/integration/testsuite/Magento/Framework/View/_files/static/expected/styles.magento.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)