diff --git a/composer.json b/composer.json index 34bcb641..d4643665 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "gridelementsteam/gridelements": "^9.2", "helhum/typo3-console": "^5.6", "league/csv": "^9.2", - "pixelant/pxa-social-feed": "^1.10", + "pixelant/pxa-social-feed": "^2.0", "symfony/http-client": "^4.3", "symfony/options-resolver": "^4.2", "symfony/property-access": "^4.3", diff --git a/composer.lock b/composer.lock index e1744a0c..59261830 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "52a24229034a16de11c1cc47597e1df1", + "content-hash": "e68b342d4ca7a1c8f297b4e17a055dc5", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -1177,9 +1177,9 @@ "authors": [ { "name": "Helmut Hummel", + "role": "Developer", "email": "info@helhum.io", - "homepage": "http://helhum.io", - "role": "Developer" + "homepage": "http://helhum.io" } ], "description": "A reliable and powerful command line interface for TYPO3 CMS", @@ -1368,30 +1368,26 @@ }, { "name": "pixelant/pxa-social-feed", - "version": "v1.10.0", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/pixelant/pxa_social_feed.git", - "reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc" + "reference": "d612540c186994197b0d433a0d468191104fe673" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/94ffd4a197e47e03227b6ecdb7af7227a67a16fc", - "reference": "94ffd4a197e47e03227b6ecdb7af7227a67a16fc", + "url": "https://api.github.com/repos/pixelant/pxa_social_feed/zipball/d612540c186994197b0d433a0d468191104fe673", + "reference": "d612540c186994197b0d433a0d468191104fe673", "shasum": "" }, "require": { - "facebook/graph-sdk": "^5.6.3", + "facebook/graph-sdk": "~5.7.0", + "php": ">=7.1", "typo3/cms-core": "^8.7 || ^9.5" }, - "replace": { - "pxa_social_feed": "self.version", - "typo3-ter/pxa-social-feed": "self.version" - }, "require-dev": { - "nimut/testing-framework": "^2.0", - "squizlabs/php_codesniffer": "2.*", - "symfony/finder": "^3.0" + "nimut/testing-framework": "^4.1", + "squizlabs/php_codesniffer": "^3.4" }, "type": "typo3-cms-extension", "extra": { @@ -1399,6 +1395,7 @@ "dev-master": "0.0.x-dev" }, "typo3/cms": { + "extension-key": "pxa_social_feed", "cms-package-dir": "{$vendor-dir}/typo3/cms", "web-dir": ".Build/Web" } @@ -1410,7 +1407,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -1421,7 +1418,7 @@ } ], "description": "Add Facebook, Instagram, and Twitter feeds to your site.", - "time": "2019-03-13T09:49:44+00:00" + "time": "2019-10-02T07:06:54+00:00" }, { "name": "psr/cache", diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php index 58a4e9b2..7b689901 100644 --- a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php +++ b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php @@ -75,6 +75,14 @@ class Product $product['description'] = SerializationUtility::sanitizeText($entity->getTeaser()); $product['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages(), $imageProcessingInstructions); $product['video'] = $entity->getVideo(); + $product['journey'] = null; + + if ($entity->getJourney()) { + $product['journey'] = [ + 'byBus' => SerializationUtility::sanitizeText($entity->getJourney()->getByBus()), + 'byCar' => SerializationUtility::sanitizeText($entity->getJourney()->getByCar()), + ]; + } $link = $entity->getExternalLink() ?: $entity->getDetailPage(); $product['link'] = SerializationUtility::generateLink($link, $queryData); diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript index 91f1cf6d..64043e3a 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript @@ -19,3 +19,10 @@ page.includeJSFooter { pxa_social_feed_4 > pxa_social_feed_5 > } + +page.includeJSFooterlibs { + pxa_social_feed_1 > + pxa_social_feed_2 > + pxa_social_feed_3 > + pxa_social_feed_4 > +} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html index fe617902..1dcca06f 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html @@ -20,13 +20,19 @@ - - - + + + + + + + + + - + - +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html index 6879ece1..b36b5828 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/SocialMedia/Feeds/List.html @@ -1,4 +1,5 @@
@@ -24,7 +25,7 @@

{feed.postDate -> f:format.date(format: 'd.m.Y')} @{feed.configuration.name}

- {feed.message -> f:format.crop(maxCharacters: '120') -> f:format.nl2br()} + {feed.decodedMessage -> f:format.crop(maxCharacters: '120') -> pxa:parseMessage(type: feed.configuration.token.type) -> f:format.nl2br()}