Skip to content

Commit 06274cb

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #18155: Fix type hint of @message declaration as the "setWidgetParameters" method allows arrays too (by @avstudnitz) - #18401: Admin > Footer > Aligning Proportionally (by @rafaelstz) - #17516: Feature australian regions (by @maximbaibakov) Fixed GitHub Issues: - #17514: Add Australian regions (reported by @maximbaibakov) has been fixed in #17516 by @maximbaibakov in 2.2-develop branch Related commits: 1. 1b8b012 2. b1fcec4 3. 020ca36 4. ebb517b
2 parents 74aa43b + 9f1fe7f commit 06274cb

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

app/code/Magento/Directory/Setup/UpgradeData.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
4646
if (version_compare($context->getVersion(), '2.0.2', '<')) {
4747
$this->addCountryRegions($setup, 'IN', $this->getDataForIndia());
4848
}
49+
if (version_compare($context->getVersion(), '2.0.3', '<')) {
50+
$this->addCountryRegions($setup, 'AU', $this->getDataForAustralia());
51+
}
4952
}
5053

5154
/**
@@ -127,6 +130,25 @@ private function getDataForIndia()
127130
];
128131
}
129132

133+
/**
134+
* Australian states data.
135+
*
136+
* @return array
137+
*/
138+
private function getDataForAustralia()
139+
{
140+
return [
141+
'ACT' => 'Australian Capital Territory',
142+
'NSW' => 'New South Wales',
143+
'VIC' => 'Victoria',
144+
'QLD' => 'Queensland',
145+
'SA' => 'South Australia',
146+
'TAS' => 'Tasmania',
147+
'WA' => 'Western Australia',
148+
'NT' => 'Northern Territory'
149+
];
150+
}
151+
130152
/**
131153
* Add country regions data to appropriate tables.
132154
*

app/code/Magento/Directory/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Magento_Directory" setup_version="2.0.2">
9+
<module name="Magento_Directory" setup_version="2.0.3">
1010
<sequence>
1111
<module name="Magento_Store"/>
1212
</sequence>

app/code/Magento/Widget/Model/Widget/Instance.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @method string getTitle()
1616
* @method \Magento\Widget\Model\Widget\Instance setTitle(string $value)
1717
* @method \Magento\Widget\Model\Widget\Instance setStoreIds(string $value)
18-
* @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string $value)
18+
* @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string|array $value)
1919
* @method int getSortOrder()
2020
* @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value)
2121
* @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value)

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
border-top: @footer__border-width solid @footer__border-color;
2626
color: @footer__color;
2727
margin-top: auto;
28-
padding: 2.6rem 2rem 6rem 3rem;
28+
padding: 2.6rem 3rem 6rem;
2929

3030
a {
3131
.lib-link(

0 commit comments

Comments
 (0)