Skip to content

Commit 8b583da

Browse files
author
Magento CICD
authored
merge magento/2.2-develop into magento-mpi/MPI-PR24
2 parents dced646 + b4cd9d1 commit 8b583da

File tree

7 files changed

+59
-32
lines changed

7 files changed

+59
-32
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<zip countryCode="CA">
8282
<codes>
8383
<code id="pattern_1" active="true" example="A1B 2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}\s[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
84+
<code id="pattern_2" active="true" example="A1B2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
8485
</codes>
8586
</zip>
8687
<zip countryCode="IC">

‎app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
4444
);
4545
$valueExpr = $connection->getCheckSql(
4646
"{$optionTable2}.value_id IS NULL",
47-
"{$optionTable1}.value",
48-
"{$optionTable2}.value"
47+
"{$optionTable1}.option_id",
48+
"{$optionTable2}.option_id"
4949
);
5050

5151
$collection->getSelect()->joinLeft(

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@
106106
.lib-dropdown(
107107
@_toggle-selector: ~'.action.showcart',
108108
@_options-selector: ~'.block-minicart',
109+
@_dropdown-list-width: 320px,
110+
@_dropdown-list-position-right: 0px,
111+
@_dropdown-list-pointer-position: right,
112+
@_dropdown-list-pointer-position-left-right: 26px,
113+
@_dropdown-list-z-index: 101,
109114
@_dropdown-toggle-icon-content: @icon-cart,
110115
@_dropdown-toggle-active-icon-content: @icon-cart,
111116
@_dropdown-list-item-padding: false,
@@ -121,23 +126,10 @@
121126

122127
.block-minicart {
123128
.lib-css(padding, 25px @minicart__padding-horizontal);
124-
right: 0;
125-
width: 320px;
126-
z-index: 101;
127129

128130
.block-title {
129131
display: none;
130132
}
131-
132-
&:after {
133-
left: auto;
134-
right: 25px;
135-
}
136-
137-
&:before {
138-
left: auto;
139-
right: 26px;
140-
}
141133
}
142134

143135
.product {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
.switcher {
9494
border-top: 1px solid @color-gray82;
9595
font-size: 1.6rem;
96-
font-weight: 700;
96+
font-weight: @font-weight__bold;
9797
margin: 0;
9898
padding: .8rem 3.5rem .8rem 2rem;
9999

@@ -147,7 +147,7 @@
147147

148148
&.greet.welcome {
149149
border-top: 1px solid @color-gray82;
150-
font-weight: 700;
150+
font-weight: @font-weight__bold;
151151
padding: .8rem @indent__base;
152152
}
153153

@@ -161,7 +161,7 @@
161161
.lib-css(color, @navigation-level0-item__color);
162162
.lib-css(text-decoration, @navigation-level0-item__text-decoration);
163163
display: block;
164-
font-weight: 700;
164+
font-weight: @font-weight__bold;
165165
padding: .8rem @indent__base;
166166
}
167167

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
.lib-dropdown(
110110
@_toggle-selector: ~'.action.showcart',
111111
@_options-selector: ~'.block-minicart',
112+
@_dropdown-list-width: 320px,
113+
@_dropdown-list-position-right: 0px,
114+
@_dropdown-list-pointer-position: right,
115+
@_dropdown-list-pointer-position-left-right: 26px,
116+
@_dropdown-list-z-index: 101,
112117
@_dropdown-toggle-icon-content: @icon-cart,
113118
@_dropdown-toggle-active-icon-content: @icon-cart,
114119
@_dropdown-list-item-padding: false,
@@ -124,23 +129,10 @@
124129

125130
.block-minicart {
126131
.lib-css(padding, 25px @minicart__padding-horizontal);
127-
right: 0;
128-
width: 320px;
129-
z-index: 101;
130132

131133
.block-title {
132134
display: none;
133135
}
134-
135-
&:after {
136-
left: auto;
137-
right: 25px;
138-
}
139-
140-
&:before {
141-
left: auto;
142-
right: 26px;
143-
}
144136
}
145137

146138
.product {

‎dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,48 @@ public function testPostCodesThrowsExceptionIfCountryDoesNotExist()
4242
$this->validator->validate('12345', 'INVALID-CODE');
4343
}
4444

45+
/**
46+
* @dataProvider getCanadaInvalidPostCodes
47+
*/
48+
public function testInvalidCanadaZipCode($countryId, $invalidPostCode)
49+
{
50+
$this->assertFalse($this->validator->validate($invalidPostCode, $countryId));
51+
}
52+
53+
/**
54+
* @dataProvider getCanadaValidPostCodes
55+
*/
56+
public function testValidCanadaZipCode($countryId, $validPostCode)
57+
{
58+
$this->assertTrue($this->validator->validate($validPostCode, $countryId));
59+
}
60+
61+
/**
62+
* @return array
63+
*/
64+
public function getCanadaInvalidPostCodes()
65+
{
66+
return [
67+
['countryId' => 'CA', 'postcode' => '12345'],
68+
['countryId' => 'CA', 'postcode' => 'A1B2C3D'],
69+
['countryId' => 'CA', 'postcode' => 'A1B2C'],
70+
['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
71+
];
72+
}
73+
74+
/**
75+
* @return array
76+
*/
77+
public function getCanadaValidPostCodes()
78+
{
79+
return [
80+
['countryId' => 'CA', 'postcode' => 'A1B2C3'],
81+
['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
82+
['countryId' => 'CA', 'postcode' => 'Z9Y 8X7'],
83+
['countryId' => 'CA', 'postcode' => 'Z9Y8X7'],
84+
];
85+
}
86+
4587
/**
4688
* @return array
4789
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)

‎lib/internal/Magento/Framework/Setup/Lists.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Lists
2626
*
2727
* @var array
2828
*/
29-
protected $allowedCurrencies;
29+
private $allowedCurrencies;
3030

3131
/**
3232
* @param ConfigInterface $localeConfig

0 commit comments

Comments
 (0)