Don't add a link to the cart if customer is redirected to cart already after adding a product

Author: avstudnitz

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

@@ -118,12 +118,7 @@ protected function getBackUrl($defaultUrl = null)
             return $returnUrl;
         }
 
-        $shouldRedirectToCart = $this->_scopeConfig->getValue(
-            'checkout/cart/redirect_to_cart',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-
-        if ($shouldRedirectToCart || $this->getRequest()->getParam('in_cart')) {
+        if ($this->shouldRedirectToCart() || $this->getRequest()->getParam('in_cart')) {
             if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) {
                 $this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl());
             }
@@ -132,4 +127,15 @@ protected function getBackUrl($defaultUrl = null)
 
         return $defaultUrl;
     }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRedirectToCart()
+    {
+        return $this->_scopeConfig->isSetFlag(
+            'checkout/cart/redirect_to_cart',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }

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

@@ -122,13 +122,21 @@ public function execute()
 
             if (!$this->_checkoutSession->getNoCartRedirect(true)) {
                 if (!$this->cart->getQuote()->getHasError()) {
-                    $this->messageManager->addComplexSuccessMessage(
-                        'addCartSuccessMessage',
-                        [
-                            'product_name' => $product->getName(),
-                            'cart_url' => $this->getCartUrl(),
-                        ]
-                    );
+                    if ($this->shouldRedirectToCart()) {
+                        $message = __(
+                            'You added %1 to your shopping cart.',
+                            $product->getName()
+                        );
+                        $this->messageManager->addSuccessMessage($message);
+                    } else {
+                        $this->messageManager->addComplexSuccessMessage(
+                            'addCartSuccessMessage',
+                            [
+                                'product_name' => $product->getName(),
+                                'cart_url' => $this->getCartUrl(),
+                            ]
+                        );
+                    }
                 }
                 return $this->goBack(null, $product);
             }