diff --git a/Model/Write/Products/CollectionDecorator/Children.php b/Model/Write/Products/CollectionDecorator/Children.php
index 590032f..44f546b 100644
--- a/Model/Write/Products/CollectionDecorator/Children.php
+++ b/Model/Write/Products/CollectionDecorator/Children.php
@@ -83,6 +83,7 @@ class Children implements DecoratorInterface
* @param Helper $helper
* @param DbResourceHelper $dbResource
* @param TweakwiseConfig $config
+ * @param WebsiteLink $websiteLink
*/
public function __construct(
ProductType $productType,
@@ -92,7 +93,8 @@ public function __construct(
CollectionFactory $collectionFactory,
Helper $helper,
DbResourceHelper $dbResource,
- TweakwiseConfig $config
+ TweakwiseConfig $config,
+ private readonly WebsiteLink $websiteLink
) {
$this->productType = $productType;
$this->eavIteratorFactory = $eavIteratorFactory;
@@ -113,6 +115,7 @@ public function decorate(Collection|StockCollection|PriceCollection $collection)
{
$this->childEntities = $this->collectionFactory->create(['store' => $collection->getStore()]);
$this->createChildEntities($collection);
+ $this->websiteLink->decorate($this->childEntities);
$this->loadChildAttributes($collection->getStore());
}
diff --git a/Model/Write/Products/CompositeExportEntity.php b/Model/Write/Products/CompositeExportEntity.php
index 5640841..919daed 100644
--- a/Model/Write/Products/CompositeExportEntity.php
+++ b/Model/Write/Products/CompositeExportEntity.php
@@ -71,7 +71,7 @@ public function getEnabledChildren(): array
$this->enabledChildren = [];
foreach ($this->getAllChildren() as $child) {
- if ($child->shouldExportByStatus()) {
+ if ($child->shouldExport()) {
$this->enabledChildren[] = $child;
}
}
diff --git a/Model/Write/Products/ExportEntity.php b/Model/Write/Products/ExportEntity.php
index 70d76c8..cd07835 100644
--- a/Model/Write/Products/ExportEntity.php
+++ b/Model/Write/Products/ExportEntity.php
@@ -268,6 +268,7 @@ public function addAttribute(string $attribute, $value): void
public function getAttributes(): array
{
$result = [];
+ $result['item_typeproduct'] = ['attribute' => 'item_type', 'value' => 'product'];
foreach ($this->attributes as $attribute => $values) {
foreach ($values as $value) {
$result[$attribute . $value] = ['attribute' => $attribute, 'value' => $value];
diff --git a/Model/Write/Products/ExportEntityChild.php b/Model/Write/Products/ExportEntityChild.php
index 205bea3..bdc1b05 100644
--- a/Model/Write/Products/ExportEntityChild.php
+++ b/Model/Write/Products/ExportEntityChild.php
@@ -71,7 +71,8 @@ public function setChildOptions(ChildOptions $childOptions): void
public function shouldExport(): bool
{
return $this->shouldExportByStock()
- && $this->shouldExportByStatus();
+ && $this->shouldExportByStatus() &&
+ $this->shouldExportByWebsite();
}
/**
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 1720767..6a5c16b 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -15,7 +15,7 @@
Tweakwise_Magento2TweakwiseExport::config
- Tweakwise Export version v7.2.1
+ Tweakwise Export version v7.2.2
Magento\Config\Model\Config\Source\Yesno