-
Notifications
You must be signed in to change notification settings - Fork 17
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.
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
FEATURE: merge images from child to configurable #24
Closed
sylvainraye
wants to merge
10
commits into
oroinc:3.1
from
diglin:feature/merge-images-from-child-to-configurable
Closed
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fe44e6c
[FEATURE] Allow to merge images into configurable products from simpl…
sylvainraye 0105270
[FEATURE] Update bundle installer to add the "akeneo_attributes_image…
sylvainraye 22e7fde
ENHANCE: validate the attribute list for image before submit
sylvainraye 6c1b8ba
ENHANCE: change wording of the tooltip, init variable with array
sylvainraye cf7f480
-FEATURE: remove the feature which allows to import categories from a…
sylvainraye 576c02f
ENHANCE: wording
sylvainraye 707d10b
ENHANCE: take in account feedback regarding the uniqueness of identif…
sylvainraye 8a32e25
ENHANCE: as validator is present, remove str_replace for empty charac…
sylvainraye 472be9e
-FEATURE: remove code from an other PR
sylvainraye c36cefb
BUGFIX: add missing attribute code validator into services.yml
sylvainraye File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -141,7 +141,28 @@ class AkeneoSettings extends Transport | |
private $priceList; | ||
|
||
/** | ||
* @var ParameterBag | ||
* @var string | ||
* | ||
* @ORM\Column(name="akeneo_attributes_list", type="text", nullable=true) | ||
*/ | ||
private $akeneoAttributesList; | ||
|
||
/** | ||
* @var string | ||
* | ||
* @ORM\Column(name="akeneo_attributes_image_list", type="text", nullable=true) | ||
*/ | ||
private $akeneoAttributesImageList; | ||
|
||
/** | ||
* @var boolean | ||
* | ||
* @ORM\Column(name="akeneo_merge_image_to_parent", type="boolean", options={"default":"false"}) | ||
*/ | ||
private $akeneoMergeImageToParent = false; | ||
|
||
/** | ||
* @var ParameterBagisAkeneoMergeImageToParent | ||
*/ | ||
private $settings; | ||
|
||
|
@@ -224,19 +245,20 @@ public function getSettingsBag() | |
if (null === $this->settings) { | ||
$this->settings = new ParameterBag( | ||
[ | ||
'clientId' => $this->getClientId(), | ||
'secret' => $this->getSecret(), | ||
'akeneoChannels' => $this->getAkeneoChannels(), | ||
'akeneoActiveChannel' => $this->getAkeneoActiveChannel(), | ||
'username' => $this->getUsername(), | ||
'password' => $this->getPassword(), | ||
'token' => $this->getToken(), | ||
'refreshToken' => $this->getRefreshToken(), | ||
'syncProducts' => $this->getSyncProducts(), | ||
'akeneoCurrencies' => $this->getAkeneoCurrencies(), | ||
'clientId' => $this->getClientId(), | ||
'secret' => $this->getSecret(), | ||
'akeneoChannels' => $this->getAkeneoChannels(), | ||
'akeneoActiveChannel' => $this->getAkeneoActiveChannel(), | ||
'username' => $this->getUsername(), | ||
'password' => $this->getPassword(), | ||
'token' => $this->getToken(), | ||
'refreshToken' => $this->getRefreshToken(), | ||
'syncProducts' => $this->getSyncProducts(), | ||
'akeneoCurrencies' => $this->getAkeneoCurrencies(), | ||
'akeneoActiveCurrencies' => $this->getAkeneoActiveCurrencies(), | ||
'akeneoLocales' => $this->getAkeneoLocales()->toArray(), | ||
'akeneoLocalesList' => $this->getAkeneoLocalesList(), | ||
'akeneoLocales' => $this->getAkeneoLocales()->toArray(), | ||
'akeneoLocalesList' => $this->getAkeneoLocalesList(), | ||
'akeneoAttributesList' => $this->getAkeneoAttributesList(), | ||
] | ||
); | ||
} | ||
|
@@ -506,6 +528,46 @@ public function setAkeneoLocalesList(array $akeneoLocalesList = null) | |
return $this; | ||
} | ||
|
||
/** | ||
* @return string|null | ||
*/ | ||
public function getAkeneoAttributesList(): ?string | ||
{ | ||
return $this->akeneoAttributesList; | ||
} | ||
|
||
/** | ||
* @param string $attributeList | ||
* | ||
* @return $this | ||
*/ | ||
public function setAkeneoAttributesList($attributeList) | ||
{ | ||
$this->akeneoAttributesList = $attributeList; | ||
|
||
return $this; | ||
} | ||
|
||
/** | ||
* @return string|null | ||
*/ | ||
public function getAkeneoAttributesImageList(): ?string | ||
dxops marked this conversation as resolved.
Show resolved
Hide resolved
|
||
{ | ||
return $this->akeneoAttributesImageList; | ||
} | ||
|
||
/** | ||
* @param string $akeneoAttributesImageList | ||
* | ||
* @return $this | ||
*/ | ||
public function setAkeneoAttributesImageList($akeneoAttributesImageList) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add typehint and return type please |
||
{ | ||
$this->akeneoAttributesImageList = $akeneoAttributesImageList; | ||
|
||
return $this; | ||
} | ||
|
||
/** | ||
* @return string | ||
*/ | ||
|
@@ -607,4 +669,24 @@ public function setPriceList(PriceList $priceList): self | |
|
||
return $this; | ||
} | ||
|
||
/** | ||
* @return bool | ||
*/ | ||
public function isAkeneoMergeImageToParent(): ?bool | ||
{ | ||
return $this->akeneoMergeImageToParent; | ||
} | ||
|
||
/** | ||
* @param bool $akeneoMergeImageToParent | ||
* | ||
* @return $this | ||
*/ | ||
public function setAkeneoMergeImageToParent(bool $akeneoMergeImageToParent) | ||
{ | ||
$this->akeneoMergeImageToParent = $akeneoMergeImageToParent; | ||
|
||
return $this; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typo