Skip to content

Commit 2281c89

Browse files
RomaKisRomaKis
committed
Merge remote-tracking branch 'origin/MAGETWO-67037' into 2.2-develop-pr10
2 parents 32a9f93 + f9696ce commit 2281c89

File tree

3 files changed

+107
-22
lines changed

3 files changed

+107
-22
lines changed

‎app/code/Magento/Directory/Setup/InstallData.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -809,27 +809,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
809809
['BR', 'SE', 'Sergipe'],
810810
['BR', 'TO', 'Tocantins'],
811811
['BR', 'DF', 'Distrito Federal'],
812-
['HR', 'HR-01', 'Zagrebačka županija'],
813-
['HR', 'HR-02', 'Krapinsko-zagorska županija'],
814-
['HR', 'HR-03', 'Sisačko-moslavačka županija'],
815-
['HR', 'HR-04', 'Karlovačka županija'],
816-
['HR', 'HR-05', 'Varaždinska županija'],
817-
['HR', 'HR-06', 'Koprivničko-križevačka županija'],
818-
['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
819-
['HR', 'HR-08', 'Primorsko-goranska županija'],
820-
['HR', 'HR-09', 'Ličko-senjska županija'],
821-
['HR', 'HR-10', 'Virovitičko-podravska županija'],
822-
['HR', 'HR-11', 'Požeško-slavonska županija'],
823-
['HR', 'HR-12', 'Brodsko-posavska županija'],
824-
['HR', 'HR-13', 'Zadarska županija'],
825-
['HR', 'HR-14', 'Osječko-baranjska županija'],
826-
['HR', 'HR-15', 'Šibensko-kninska županija'],
827-
['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
828-
['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
829-
['HR', 'HR-18', 'Istarska županija'],
830-
['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
831-
['HR', 'HR-20', 'Međimurska županija'],
832-
['HR', 'HR-21', 'Grad Zagreb']
833812
];
834813

835814
foreach ($data as $row) {

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

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Directory\Setup;
8+
9+
use Magento\Framework\Setup\ModuleContextInterface;
10+
use Magento\Framework\Setup\ModuleDataSetupInterface;
11+
use Magento\Framework\Setup\UpgradeDataInterface;
12+
use Magento\Directory\Helper\Data;
13+
14+
/**
15+
* Upgrade Data script for Directory module.
16+
*/
17+
class UpgradeData implements UpgradeDataInterface
18+
{
19+
/**
20+
* Directory data.
21+
*
22+
* @var Data
23+
*/
24+
private $directoryData;
25+
26+
/**
27+
* @param Data $directoryData
28+
*/
29+
public function __construct(Data $directoryData)
30+
{
31+
$this->directoryData = $directoryData;
32+
}
33+
34+
/**
35+
* Upgrades data for Directry module.
36+
*
37+
* @param ModuleDataSetupInterface $setup
38+
* @param ModuleContextInterface $context
39+
* @return void
40+
*/
41+
public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
42+
{
43+
if (version_compare($context->getVersion(), '2.0.1', '<')) {
44+
$this->addCroatia($setup);
45+
}
46+
}
47+
48+
/**
49+
* Add Croatia and it's states to appropriate tables.
50+
*
51+
* @param ModuleDataSetupInterface $setup
52+
* @return void
53+
*/
54+
private function addCroatia($setup)
55+
{
56+
/**
57+
* Fill table directory/country_region
58+
* Fill table directory/country_region_name for en_US locale
59+
*/
60+
$data = [
61+
['HR', 'HR-01', 'Zagrebačka županija'],
62+
['HR', 'HR-02', 'Krapinsko-zagorska županija'],
63+
['HR', 'HR-03', 'Sisačko-moslavačka županija'],
64+
['HR', 'HR-04', 'Karlovačka županija'],
65+
['HR', 'HR-05', 'Varaždinska županija'],
66+
['HR', 'HR-06', 'Koprivničko-križevačka županija'],
67+
['HR', 'HR-07', 'Bjelovarsko-bilogorska županija'],
68+
['HR', 'HR-08', 'Primorsko-goranska županija'],
69+
['HR', 'HR-09', 'Ličko-senjska županija'],
70+
['HR', 'HR-10', 'Virovitičko-podravska županija'],
71+
['HR', 'HR-11', 'Požeško-slavonska županija'],
72+
['HR', 'HR-12', 'Brodsko-posavska županija'],
73+
['HR', 'HR-13', 'Zadarska županija'],
74+
['HR', 'HR-14', 'Osječko-baranjska županija'],
75+
['HR', 'HR-15', 'Šibensko-kninska županija'],
76+
['HR', 'HR-16', 'Vukovarsko-srijemska županija'],
77+
['HR', 'HR-17', 'Splitsko-dalmatinska županija'],
78+
['HR', 'HR-18', 'Istarska županija'],
79+
['HR', 'HR-19', 'Dubrovačko-neretvanska županija'],
80+
['HR', 'HR-20', 'Međimurska županija'],
81+
['HR', 'HR-21', 'Grad Zagreb']
82+
];
83+
foreach ($data as $row) {
84+
$bind = ['country_id' => $row[0], 'code' => $row[1], 'default_name' => $row[2]];
85+
$setup->getConnection()->insert($setup->getTable('directory_country_region'), $bind);
86+
$regionId = $setup->getConnection()->lastInsertId($setup->getTable('directory_country_region'));
87+
$bind = ['locale' => 'en_US', 'region_id' => $regionId, 'name' => $row[2]];
88+
$setup->getConnection()->insert($setup->getTable('directory_country_region_name'), $bind);
89+
}
90+
/**
91+
* Upgrade core_config_data general/region/state_required field.
92+
*/
93+
$countries = $this->directoryData->getCountryCollection()->getCountriesWithRequiredStates();
94+
$setup->getConnection()->update(
95+
$setup->getTable('core_config_data'),
96+
[
97+
'value' => implode(',', array_keys($countries))
98+
],
99+
[
100+
'scope="default"',
101+
'scope_id=0',
102+
'path=?' => Data::XML_PATH_STATES_REQUIRED
103+
]
104+
);
105+
}
106+
}

‎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.0">
9+
<module name="Magento_Directory" setup_version="2.0.1">
1010
<sequence>
1111
<module name="Magento_Store"/>
1212
</sequence>

0 commit comments

Comments
 (0)