Merge branch 'MAGETWO-69210-final' into PR-2.2-develop

Author: VladimirZaets

app/code/Magento/Catalog/view/frontend/templates/product/list.phtml

@@ -78,7 +78,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                 <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $postParams['action'] ?>" method="post">
+                                        <form data-role="tocart-form" data-product-sku="<?= /* @escapeNotVerified */ $_product->getSku() ?>" action="<?= /* @escapeNotVerified */ $postParams['action'] ?>" method="post">
                                             <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
                                             <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
@@ -121,7 +121,9 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
-                "catalogAddToCart": {}
+                "catalogAddToCart": {
+                    "product_sku": "<?= /* @escapeNotVerified */ $_product->getSku() ?>"
+                }
             }
         }
         </script>

app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

@@ -16,7 +16,8 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form action="<?= /* @escapeNotVerified */ $block->getSubmitUrl($_product) ?>" method="post"
+    <form data-product-sku="<?= /* @escapeNotVerified */ $_product->getSku() ?>"
+          action="<?= /* @escapeNotVerified */ $block->getSubmitUrl($_product) ?>" method="post"
           id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
         <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -97,6 +97,8 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
+                    $(document).trigger('ajax:addToCart', form.data().productSku);
+
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);
                     }

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -228,10 +228,18 @@ define([
         },
 
         /**
-         * Update content after item remove.
+         * Update content after item remove
+         *
+         * @param elem
+         * @param response
          * @private
          */
-        _removeItemAfter: function () {
+        _removeItemAfter: function (elem, response) {
+            var productData = customerData.get('cart')().items.find(function (item) {
+                return Number(elem.data('cart-item')) === Number(item['item_id']);
+            });
+
+            $(document).trigger('ajax:removeFromCart', productData['product_sku']);
         },
 
         /**