From 733457043acc35e683bb61fec7ca3065f7ef3d66 Mon Sep 17 00:00:00 2001 From: Andreas Schrammel Date: Sat, 17 Mar 2018 11:31:28 +0100 Subject: [PATCH 1/3] sparkles: Add website- and storeview-code Add website- and storeview-code in stores Admin-Grid. --- .../Magento/Backend/Block/System/Store/Grid/Render/Store.php | 3 ++- .../Magento/Backend/Block/System/Store/Grid/Render/Website.php | 3 ++- .../Magento/Store/Model/ResourceModel/Website/Collection.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php index 23b2de683a958..50459b596ac57 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php @@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row) $this->getUrl('adminhtml/*/editStore', ['store_id' => $row->getStoreId()]) . '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . - ''; + '
' . + '(Code: ' . $row->getStoreCode() . ')'; } } diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php index 913e2c903d20c..ec6d0fc07cec9 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php @@ -24,6 +24,7 @@ public function render(\Magento\Framework\DataObject $row) $this->getUrl('adminhtml/*/editWebsite', ['website_id' => $row->getWebsiteId()]) . '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . - ''; + '
' . + '(Code: ' . $row->getCode() . ')'; } } diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php index 5b3a74d5d8d39..7e126743e0572 100644 --- a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php +++ b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php @@ -142,7 +142,7 @@ public function joinGroupAndStore() )->joinLeft( ['store_table' => $this->getTable('store')], 'group_table.group_id = store_table.group_id', - ['store_id' => 'store_id', 'store_title' => 'name'] + ['store_id' => 'store_id', 'store_title' => 'name', 'store_code' => 'code'] ); $this->addOrder('group_table.name', \Magento\Framework\DB\Select::SQL_ASC) // store name ->addOrder( From 7ff2acbf8b4f427358eeba8cc0094e4eb5d9b6bb Mon Sep 17 00:00:00 2001 From: Andreas Schrammel Date: Sat, 17 Mar 2018 14:20:12 +0100 Subject: [PATCH 2/3] ok_hand: Add store code Add store code in store admin grid. --- .../Magento/Backend/Block/System/Store/Grid/Render/Group.php | 3 ++- .../Magento/Store/Model/ResourceModel/Website/Collection.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php index 59657f38465d7..2bb0117e015da 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php @@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row) $this->getUrl('adminhtml/*/editGroup', ['group_id' => $row->getGroupId()]) . '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . - ''; + '
' + . '(Code: ' . $row->getGroupCode() . ')'; } } diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php index 7e126743e0572..fb23e842a38e3 100644 --- a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php +++ b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php @@ -138,7 +138,7 @@ public function joinGroupAndStore() $this->getSelect()->joinLeft( ['group_table' => $this->getTable('store_group')], 'main_table.website_id = group_table.website_id', - ['group_id' => 'group_id', 'group_title' => 'name'] + ['group_id' => 'group_id', 'group_title' => 'name', 'group_code' => 'code'] )->joinLeft( ['store_table' => $this->getTable('store')], 'group_table.group_id = store_table.group_id', From 2114eebba22f359a7c7b7c24cc71621ab05948bf Mon Sep 17 00:00:00 2001 From: Andreas Schrammel Date: Mon, 19 Mar 2018 07:54:31 +0100 Subject: [PATCH 3/3] ok_hand: :globe_with_meridians: Make "Code" translatable Make "Code" string translateable. Translation for "Code" is already contained in i18n/en_US.csv (Line 101). --- .../Magento/Backend/Block/System/Store/Grid/Render/Group.php | 2 +- .../Magento/Backend/Block/System/Store/Grid/Render/Store.php | 2 +- .../Magento/Backend/Block/System/Store/Grid/Render/Website.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php index 2bb0117e015da..3d7154eb20f92 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php @@ -28,6 +28,6 @@ public function render(\Magento\Framework\DataObject $row) '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '
' - . '(Code: ' . $row->getGroupCode() . ')'; + . '(' . __('Code') . ': ' . $row->getGroupCode() . ')'; } } diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php index 50459b596ac57..9cfc8bfc52691 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php @@ -28,6 +28,6 @@ public function render(\Magento\Framework\DataObject $row) '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '
' . - '(Code: ' . $row->getStoreCode() . ')'; + '(' . __('Code') . ': ' . $row->getStoreCode() . ')'; } } diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php index ec6d0fc07cec9..487eb4f8acfda 100644 --- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php +++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php @@ -25,6 +25,6 @@ public function render(\Magento\Framework\DataObject $row) '">' . $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '
' . - '(Code: ' . $row->getCode() . ')'; + '(' . __('Code') . ': ' . $row->getCode() . ')'; } }