Skip to content
Snippets Groups Projects
Commit 92dd623b authored by Miguel Balparda's avatar Miguel Balparda
Browse files

MAGETWO-86430: [Backport to 2.2-develop] Attribute with 'Catalog Input Type...

MAGETWO-86430: [Backport to 2.2-develop] Attribute with 'Catalog Input Type for Store Owner' equal 'Fixed Product Tax' for Multi-store #13019

 - Merge Pull Request magento/magento2#13019 from dverkade/magento2:2.2-Attribute-with-Catalog-Input-Type-for-Store-Owner
 - Merged commits:
   1. 13546a71
parents 816ec39b 13546a71
Branches
No related merge requests found
...@@ -68,7 +68,7 @@ class Website ...@@ -68,7 +68,7 @@ class Website
if ($storeId = $this->locator->getStore()->getId()) { if ($storeId = $this->locator->getStore()->getId()) {
/** @var WebsiteInterface $website */ /** @var WebsiteInterface $website */
$website = $this->storeManager->getStore($storeId)->getWebsite(); $website = $this->storeManager->getStore($storeId)->getWebsite();
$websites[$website->getId()] = [ $websites[] = [
'value' => $website->getId(), 'value' => $website->getId(),
'label' => $this->formatLabel( 'label' => $this->formatLabel(
$website->getName(), $website->getName(),
...@@ -81,7 +81,7 @@ class Website ...@@ -81,7 +81,7 @@ class Website
if (!in_array($website->getId(), $product->getWebsiteIds())) { if (!in_array($website->getId(), $product->getWebsiteIds())) {
continue; continue;
} }
$websites[$website->getId()] = [ $websites[] = [
'value' => $website->getId(), 'value' => $website->getId(),
'label' => $this->formatLabel( 'label' => $this->formatLabel(
$website->getName(), $website->getName(),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment