UPMERGE: develop -> main

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "netlogix/neos-content",
     "description": "This plugin enables Shopware templates to be designed with an Enterprise CMS.",
-    "version": "0.1.28",
+    "version": "0.1.29",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "autoload": {

src/Listener/CmsPageLoadedListener.php

@@ -14,6 +14,7 @@
 use Shopware\Core\Content\Cms\CmsPageEntity;
 use Shopware\Core\Content\Cms\DataResolver\FieldConfig;
 use Shopware\Core\Content\Cms\DataResolver\FieldConfigCollection;
+use Shopware\Core\Content\Cms\DataResolver\ResolverContext\ResolverContext;
 use Shopware\Core\Content\Cms\Events\CmsPageLoadedEvent;
 use Shopware\Core\Content\Product\ProductDefinition;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
@@ -68,7 +69,8 @@ public function __invoke(CmsPageLoadedEvent $cmsPageLoadedEvent): void
             ),
             'page' => $this->getNewShopPageBlocks(
                 $cmsPageEntity,
-                $cmsPageLoadedEvent->getSalesChannelContext()
+                $cmsPageLoadedEvent->getSalesChannelContext(),
+                $cmsPageLoadedEvent->getRequest()
             )
         };
 
@@ -151,12 +153,16 @@ private function getNewLandingPageBlocks(
 
     private function getNewShopPageBlocks(
         CmsPageEntity $cmsPageEntity,
-        SalesChannelContext $context
+        SalesChannelContext $context,
+        Request $request
     ): CmsSectionCollection {
-        return $this->contentExchangeService->getAlternativeCmsSectionsFromNeos(
+        $resolverContext = new ResolverContext($context, $request);
+        $alternativeSections = $this->contentExchangeService->getAlternativeCmsSectionsFromNeos(
             $cmsPageEntity,
             $context->getLanguageId(),
             $context->getSalesChannelId()
         );
+        $this->contentExchangeService->loadSlotData($alternativeSections->getBlocks(), $resolverContext);
+        return $alternativeSections;
     }
 }