Skip to content

Commit f42f550

Browse files
author
Oleksii Korshenko
committed
MAGETWO-69683: Bugfix > Adding Success Message > Recent Ordered #9852
- Merge Pull Request #9852 from rafaelstz/magento2:patch-18 - Merged commits: 1. f6cbd5b 2. 4de81a5 3. 193f92b 4. 57c5fed 5. 58ee67d
2 parents 04c5b80 + 58ee67d commit f42f550

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

app/code/Magento/Checkout/Controller/Cart.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,19 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
3838
*/
3939
protected $cart;
4040

41+
/**
42+
* @var \Magento\Framework\Escaper
43+
*/
44+
protected $escaper;
45+
4146
/**
4247
* @param \Magento\Framework\App\Action\Context $context
4348
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4449
* @param \Magento\Checkout\Model\Session $checkoutSession
4550
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4651
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
4752
* @param CustomerCart $cart
53+
* @param \Magento\Framework\Escaper $escaper
4854
* @codeCoverageIgnore
4955
*/
5056
public function __construct(
@@ -53,13 +59,15 @@ public function __construct(
5359
\Magento\Checkout\Model\Session $checkoutSession,
5460
\Magento\Store\Model\StoreManagerInterface $storeManager,
5561
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
56-
CustomerCart $cart
62+
CustomerCart $cart,
63+
\Magento\Framework\Escaper $escaper = null
5764
) {
5865
$this->_formKeyValidator = $formKeyValidator;
5966
$this->_scopeConfig = $scopeConfig;
6067
$this->_checkoutSession = $checkoutSession;
6168
$this->_storeManager = $storeManager;
62-
$this->cart = $cart;
69+
$this->cart = $cart;
70+
$this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
6371
parent::__construct($context);
6472
}
6573

app/code/Magento/Checkout/Controller/Cart/Addgroup.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ public function execute()
2323
foreach ($itemsCollection as $item) {
2424
try {
2525
$this->cart->addOrderItem($item, 1);
26+
if (!$this->cart->getQuote()->getHasError()) {
27+
$message = __(
28+
'You added %1 to your shopping cart.',
29+
$this->escaper->escapeHtml($item->getName())
30+
);
31+
$this->messageManager->addSuccessMessage($message);
32+
}
2633
} catch (\Magento\Framework\Exception\LocalizedException $e) {
2734
if ($this->_checkoutSession->getUseNotice(true)) {
2835
$this->messageManager->addNotice($e->getMessage());

app/code/Magento/Checkout/Controller/Cart/Index.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class Index extends \Magento\Checkout\Controller\Cart
2121
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2222
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
2323
* @param \Magento\Checkout\Model\Cart $cart
24+
* @param \Magento\Framework\Escaper $escaper
2425
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2526
* @codeCoverageIgnore
2627
*/
@@ -31,6 +32,7 @@ public function __construct(
3132
\Magento\Store\Model\StoreManagerInterface $storeManager,
3233
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
3334
\Magento\Checkout\Model\Cart $cart,
35+
\Magento\Framework\Escaper $escaper,
3436
\Magento\Framework\View\Result\PageFactory $resultPageFactory
3537
) {
3638
parent::__construct(
@@ -39,7 +41,8 @@ public function __construct(
3941
$checkoutSession,
4042
$storeManager,
4143
$formKeyValidator,
42-
$cart
44+
$cart,
45+
$escaper
4346
);
4447
$this->resultPageFactory = $resultPageFactory;
4548
}

0 commit comments

Comments
 (0)