Skip to content

[Forwardport] Fixes saving product in single-store mode if website_id <> 1 #18210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 8 commits into from
Oct 16, 2018
Merged

[Forwardport] Fixes saving product in single-store mode if website_id <> 1 #18210

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
765f88f
Fixes saving product in single-store mode if website_id <> 1
Sep 10, 2018
558d527
Refactored the website_ids array
Sep 10, 2018
deebbc0
Applying the changes only for single store mode
Sep 10, 2018
ae2917c
Fixed the phpdocs issues for failing tests
Sep 26, 2018
e068783
Fixed line exceed errors
Sep 27, 2018
7cd36de
Refactoring the method's description
Oct 1, 2018
0e7f779
Fixed docblock
slavvka Oct 2, 2018
1133391
Merge branch '2.3-develop' into 2.3-develop-PR-port-18001
Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions app/code/Magento/Catalog/Model/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ public function getPrice()
* @see \Magento\Catalog\Model\Product\Visibility
*
* @return int
* @codeCoverageIgnoreStart
*/
public function getVisibility()
{
Expand Down Expand Up @@ -813,6 +814,9 @@ public function getStoreIds()
if (!$this->hasStoreIds()) {
$storeIds = [];
if ($websiteIds = $this->getWebsiteIds()) {
if ($this->_storeManager->isSingleStoreMode()) {
$websiteIds = array_keys($websiteIds);
}
foreach ($websiteIds as $websiteId) {
$websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
$storeIds = array_merge($storeIds, $websiteStores);
Expand Down Expand Up @@ -923,7 +927,7 @@ public function beforeSave()
*
* If value specified, it will be set.
*
* @param bool $value
* @param bool|null $value
* @return bool
*/
public function canAffectOptions($value = null)
Expand Down Expand Up @@ -1044,7 +1048,8 @@ public function reindex()
*
* Register indexing event before delete product
*
* @return \Magento\Catalog\Model\Product
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function beforeDelete()
{
Expand Down Expand Up @@ -1718,8 +1723,6 @@ public function getIsSalable()
/**
* Check is a virtual product
*
* Data helper wrapper
*
* @return bool
*/
public function isVirtual()
Expand Down Expand Up @@ -2028,7 +2031,7 @@ public function getIsVirtual()
*
* @param string $code Option code
* @param mixed $value Value of the option
* @param int|Product $product Product ID
* @param int|Product|null $product Product ID
* @return $this
*/
public function addCustomOption($code, $value, $product = null)
Expand Down Expand Up @@ -2222,9 +2225,9 @@ public function getPreconfiguredValues()
}

/**
* Prepare product custom options.
* Prepare product custom options
*
* To be sure that all product custom options does not has ID and has product instance
* To be sure that all product custom options does not has ID and has product instance.
*
* @return \Magento\Catalog\Model\Product
*/
Expand Down Expand Up @@ -2581,10 +2584,11 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
//@codeCoverageIgnoreEnd

/**
* Convert array to media gallery interface
* Convert Image to ProductAttributeMediaGalleryEntryInterface
*
* @param array $mediaGallery
* @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]
* @throws \Magento\Framework\Exception\LocalizedException
*/
protected function convertToMediaGalleryInterface(array $mediaGallery)
{
Expand All @@ -2603,6 +2607,7 @@ protected function convertToMediaGalleryInterface(array $mediaGallery)
* Returns media gallery entries
*
* @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function getMediaGalleryEntries()
{
Expand All @@ -2620,6 +2625,7 @@ public function getMediaGalleryEntries()
*
* @param ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function setMediaGalleryEntries(array $mediaGalleryEntries = null)
{
Expand Down