From 020ca367e590f5ac49df197f6002b66af5048544 Mon Sep 17 00:00:00 2001 From: Maxim Baibakov Date: Sat, 11 Aug 2018 13:20:32 +1000 Subject: [PATCH 1/6] Adding Australian regions into Magento Core --- app/code/Magento/Directory/Setup/InstallData.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/code/Magento/Directory/Setup/InstallData.php b/app/code/Magento/Directory/Setup/InstallData.php index 33c3ae4558e16..0556a7229d5e5 100644 --- a/app/code/Magento/Directory/Setup/InstallData.php +++ b/app/code/Magento/Directory/Setup/InstallData.php @@ -809,6 +809,14 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface ['BR', 'SE', 'Sergipe'], ['BR', 'TO', 'Tocantins'], ['BR', 'DF', 'Distrito Federal'], + ['AU', 'ACT', 'Australian Capital Territory'], + ['AU', 'NSW', 'New South Wales'], + ['AU', 'VIC', 'Victoria'], + ['AU', 'QLD', 'Queensland'], + ['AU', 'SA', 'South Australia'], + ['AU', 'TAS', 'Tasmania'], + ['AU', 'WA', 'Western Australia'], + ['AU', 'NT', 'Northern Territory'], ]; foreach ($data as $row) { From ebb517b4e4886eb176158bac0412557c5b2b4764 Mon Sep 17 00:00:00 2001 From: Maxim Baibakov Date: Mon, 27 Aug 2018 20:22:09 +1000 Subject: [PATCH 2/6] Adding Australian regions into for existing installs --- .../Magento/Directory/Setup/UpgradeData.php | 22 +++++++++++++++++++ app/code/Magento/Directory/etc/module.xml | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php index 4ee9ea33673d7..3f9b510550719 100644 --- a/app/code/Magento/Directory/Setup/UpgradeData.php +++ b/app/code/Magento/Directory/Setup/UpgradeData.php @@ -46,6 +46,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface if (version_compare($context->getVersion(), '2.0.2', '<')) { $this->addCountryRegions($setup, $this->getDataForIndia()); } + if (version_compare($context->getVersion(), '2.0.3', '<')) { + $this->addCountryRegions($setup, $this->getDataForAustralia()); + } } /** @@ -127,6 +130,25 @@ private function getDataForIndia() ]; } + /** + * Australian states data. + * + * @return array + */ + private function getDataForAustralia() + { + return [ + ['AU', 'ACT', 'Australian Capital Territory'], + ['AU', 'NSW', 'New South Wales'], + ['AU', 'VIC', 'Victoria'], + ['AU', 'QLD', 'Queensland'], + ['AU', 'SA', 'South Australia'], + ['AU', 'TAS', 'Tasmania'], + ['AU', 'WA', 'Western Australia'], + ['AU', 'NT', 'Northern Territory'] + ]; + } + /** * Add country regions data to appropriate tables. * diff --git a/app/code/Magento/Directory/etc/module.xml b/app/code/Magento/Directory/etc/module.xml index a3735ca6ddde1..cc8023b9b3873 100644 --- a/app/code/Magento/Directory/etc/module.xml +++ b/app/code/Magento/Directory/etc/module.xml @@ -6,7 +6,7 @@ */ --> - + From 99f6c1a84637e047996f9d6af3d3e95396c85965 Mon Sep 17 00:00:00 2001 From: Andreas von Studnitz Date: Thu, 20 Sep 2018 12:08:26 +0200 Subject: [PATCH 3/6] Fix type hint of @message declaration as the "setWidgetParameters" method allows arrays too --- app/code/Magento/Widget/Model/Widget/Instance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php index afe7ef3766f7c..1ccb75ad6611a 100644 --- a/app/code/Magento/Widget/Model/Widget/Instance.php +++ b/app/code/Magento/Widget/Model/Widget/Instance.php @@ -15,7 +15,7 @@ * @method string getTitle() * @method \Magento\Widget\Model\Widget\Instance setTitle(string $value) * @method \Magento\Widget\Model\Widget\Instance setStoreIds(string $value) - * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string $value) + * @method \Magento\Widget\Model\Widget\Instance setWidgetParameters(string|array $value) * @method int getSortOrder() * @method \Magento\Widget\Model\Widget\Instance setSortOrder(int $value) * @method \Magento\Widget\Model\Widget\Instance setThemeId(int $value) From 43d3a5fac1607400acffb4a2c12d1211d5e1c943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= Date: Fri, 5 Oct 2018 10:40:07 -0400 Subject: [PATCH 4/6] Admin > Footer > Aligning Proportionally --- .../backend/Magento_Backend/web/css/source/module/_footer.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less index 2958708e51deb..0244775fad0b6 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_footer.less @@ -25,7 +25,7 @@ border-top: @footer__border-width solid @footer__border-color; color: @footer__color; margin-top: auto; - padding: 2.6rem 2rem 6rem 3rem; + padding: 2.6rem 3rem 6rem; a { .lib-link( From 407cc51b5a42ef6ee13d0055225c586b30eae492 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Tue, 9 Oct 2018 18:31:52 +0300 Subject: [PATCH 5/6] ENGCOM-2747: Feature australian regions #17516. Remove regions duplication during install. --- app/code/Magento/Directory/Setup/InstallData.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/code/Magento/Directory/Setup/InstallData.php b/app/code/Magento/Directory/Setup/InstallData.php index 0556a7229d5e5..33c3ae4558e16 100644 --- a/app/code/Magento/Directory/Setup/InstallData.php +++ b/app/code/Magento/Directory/Setup/InstallData.php @@ -809,14 +809,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface ['BR', 'SE', 'Sergipe'], ['BR', 'TO', 'Tocantins'], ['BR', 'DF', 'Distrito Federal'], - ['AU', 'ACT', 'Australian Capital Territory'], - ['AU', 'NSW', 'New South Wales'], - ['AU', 'VIC', 'Victoria'], - ['AU', 'QLD', 'Queensland'], - ['AU', 'SA', 'South Australia'], - ['AU', 'TAS', 'Tasmania'], - ['AU', 'WA', 'Western Australia'], - ['AU', 'NT', 'Northern Territory'], ]; foreach ($data as $row) { From 9f1fe7fa97f3e6fac0ca332c7928650f7c5581b3 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Thu, 11 Oct 2018 14:29:53 +0300 Subject: [PATCH 6/6] magento-engcom/magento2ce#2240: Fixed issue with directory upgrade script --- .../Magento/Directory/Setup/UpgradeData.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php index f87272fb9ec56..8ef73e2ef36b0 100644 --- a/app/code/Magento/Directory/Setup/UpgradeData.php +++ b/app/code/Magento/Directory/Setup/UpgradeData.php @@ -47,7 +47,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $this->addCountryRegions($setup, 'IN', $this->getDataForIndia()); } if (version_compare($context->getVersion(), '2.0.3', '<')) { - $this->addCountryRegions($setup, $this->getDataForAustralia()); + $this->addCountryRegions($setup, 'AU', $this->getDataForAustralia()); } } @@ -138,14 +138,14 @@ private function getDataForIndia() private function getDataForAustralia() { return [ - ['AU', 'ACT', 'Australian Capital Territory'], - ['AU', 'NSW', 'New South Wales'], - ['AU', 'VIC', 'Victoria'], - ['AU', 'QLD', 'Queensland'], - ['AU', 'SA', 'South Australia'], - ['AU', 'TAS', 'Tasmania'], - ['AU', 'WA', 'Western Australia'], - ['AU', 'NT', 'Northern Territory'] + 'ACT' => 'Australian Capital Territory', + 'NSW' => 'New South Wales', + 'VIC' => 'Victoria', + 'QLD' => 'Queensland', + 'SA' => 'South Australia', + 'TAS' => 'Tasmania', + 'WA' => 'Western Australia', + 'NT' => 'Northern Territory' ]; }