diff --git a/Classes/Controller/CartController.php b/Classes/Controller/CartController.php index ccd5bc226448d22308ce960045073711169604fb..588078baaa5e44023d092c0dcf2aa213ab4a44db 100644 --- a/Classes/Controller/CartController.php +++ b/Classes/Controller/CartController.php @@ -16,6 +16,7 @@ use Riconet\RicoOrderThermokon\Domain\Model\Cart; use Riconet\RicoOrderThermokon\Domain\Model\CartItem; use Riconet\RicoOrderThermokon\Domain\Repository\CartRepository; use Riconet\RicoOrderThermokon\Property\AccessoryModalTypeConverter; +use TYPO3\CMS\Core\Messaging\AbstractMessage; use TYPO3\CMS\Core\Messaging\FlashMessage; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration; @@ -24,7 +25,6 @@ use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException; use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException; use TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException; use TYPO3\CMS\Extbase\Utility\LocalizationUtility; -use TYPO3\CMS\Fluid\View\StandaloneView; /** * Class CartController. @@ -145,12 +145,12 @@ class CartController extends \Riconet\RicoOrder\Controller\CartController * * @param int $itemIndex * @param int $complementaryItemUid + * @param int $returnPid * - * @return string - * - * @throws \Exception + * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException + * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException */ - public function addComplementaryItemAfterwardsAction($itemIndex, $complementaryItemUid) + public function addComplementaryItemAfterwardsAction($itemIndex, $complementaryItemUid, $returnPid) { $items = $this->cart->getItems(); if (!isset($items[$itemIndex])) { @@ -170,11 +170,19 @@ class CartController extends \Riconet\RicoOrder\Controller\CartController ); $item->setComplementaryItem($complementaryCartItem); $this->cart->addItem($item); - $view = GeneralUtility::makeInstance(StandaloneView::class); - $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName( - 'EXT:rico_order_thermokon/Resources/Private/Templates/Cart/addComplementaryItemAfterwards.html' - )); - - return $view->render(); + $this->addFlashMessage( + LocalizationUtility::translate( + 'plugin.cart.successfully_add_complementary_item_afterwards', + 'RicoOrderThermokon', + [$complementaryCartItem->getTitle()] + ), + '', + AbstractMessage::OK + ); + $uri = ControllerUtility::redirectToPid( + $this->getControllerContext(), + is_null($returnPid) ? $GLOBALS['TSFE']->id : $returnPid + ); + $this->redirectToUri($uri); } } diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf index ec76c8012fc0685dea8f3afb72d8180cfb930452..730ed6b3962d824b163c2d9891e4504c6bc022d1 100644 --- a/Resources/Private/Language/de.locallang.xlf +++ b/Resources/Private/Language/de.locallang.xlf @@ -33,7 +33,7 @@ <target>Einige Artikel in Ihrem Warenkorb wurden entfernt. Ihr Warenkorb wurde dementsprechend aktualisiert.</target> </trans-unit> <trans-unit id="plugin.cart.successfully_add_complementary_item_afterwards"> - <target>Das Komplementärgut wurde dem Warenkorb hinzugefügt.</target> + <target>Das Komplementärgut "%s" wurde dem Warenkorb hinzugefügt.</target> </trans-unit> <!-- plugin.project --> <trans-unit id="plugin.project.manipulated"> diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index e0a1917a60075a7687754b9b3182e34fb2850ed4..1c4e4869304524ad95baa60dd1c137dc661faf06 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -33,7 +33,7 @@ <source>Some articles in your cart have been deleted. Your cart has been updated accordingly.</source> </trans-unit> <trans-unit id="plugin.cart.successfully_add_complementary_item_afterwards"> - <source>Successfully add complementary item to cart.</source> + <source>Successfully add complementary item "%s" to cart.</source> </trans-unit> <!-- plugin.project --> <trans-unit id="plugin.project.manipulated"> diff --git a/Resources/Private/Partials/Cart/ComplementaryItemModal.html b/Resources/Private/Partials/Cart/ComplementaryItemModal.html index 26893adbcf32d3633043428599c4ebe2f48e3a51..a276414214780a335067be71b3bb9befd1e76337 100644 --- a/Resources/Private/Partials/Cart/ComplementaryItemModal.html +++ b/Resources/Private/Partials/Cart/ComplementaryItemModal.html @@ -11,9 +11,7 @@ <f:form action="addComplementaryItemAfterwards" controller="Cart" pluginName="cart" - extensionName="RicoOrder" - class="add-to-cart-form" - additionalAttributes="{data-ajax-url: '{t:uri.ajaxAction(action: \'addComplementaryItemAfterwards\', controller: \'Cart\', extensionName: \'RicoOrder\', pluginName: \'cart\')}'}"> + extensionName="RicoOrder"> <div class="ajax-content"></div> <f:form.hidden name="returnPid" value="{settings.cartPid}" /> <f:form.hidden name="itemIndex" value="{index}" /> diff --git a/Resources/Private/Templates/Cart/addComplementaryItemAfterwards.html b/Resources/Private/Templates/Cart/addComplementaryItemAfterwards.html deleted file mode 100644 index cf0919d6a5282985923096baa773c9a358796ae1..0000000000000000000000000000000000000000 --- a/Resources/Private/Templates/Cart/addComplementaryItemAfterwards.html +++ /dev/null @@ -1,5 +0,0 @@ -<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true"> -<div class="alert alert-success"> - <f:translate key="plugin.cart.successfully_add_complementary_item_afterwards" extensionName="RicoOrderThermokon" /> -</div> -</html> \ No newline at end of file diff --git a/ext_emconf.php b/ext_emconf.php index b4f499ab14e9802d0dc86b3b076a81a59271adb8..8f46cea08f7b286c0c5177a9b1ea2feae547abae 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -28,7 +28,7 @@ $EM_CONF[$_EXTKEY] = [ 'title' => 'Record Cart [Thermokon]', 'description' => 'Adds thermokon specific elements to rico_order', - 'version' => '1.12.3', + 'version' => '1.12.4', 'category' => 'misc', 'constraints' => [ 'depends' => [