MAGETWO-70892: [Backport] - [Google Tag Manager] Ajax "Add to Cart" / "Remove from Cart" do not fire any events - for 2.1

Author: VladimirZaets

app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml

@@ -17,7 +17,7 @@ $priceLabel = ($block->getPriceLabel() !== null)
     : '';
 ?>
 <p class="price-as-configured">
-    <?php if ($configuredPrice->getValue() !== 0): ?>
+    <?php if ($configuredPrice->getAmount()->getValue() !== null): ?>
         <?php /* @noEscape */
         echo $block->renderAmount($configuredPrice->getAmount(), [
             'display_label' => $priceLabel,

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

@@ -78,8 +78,8 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                 <div class="actions-primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position : ''; ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form"  data-product-sku="<?php /* @escapeNotVerified */  echo $_product->getSku() ?>"
-                                              action="<?php /* @escapeNotVerified */ echo $postParams['action']; ?>" method="post">
+                                        <form data-role="tocart-form"  data-product-sku="<?php echo $block->escapeHtml($_product->getSku()); ?>"
+                                              action="<?php echo $block->escapeHtml($postParams['action']); ?>" method="post">
                                             <input type="hidden" name="product" value="<?php /* @escapeNotVerified */ echo $postParams['data']['product']; ?>">
                                             <input type="hidden" name="<?php /* @escapeNotVerified */ echo Action::PARAM_NAME_URL_ENCODED; ?>" value="<?php /* @escapeNotVerified */ echo $postParams['data'][Action::PARAM_NAME_URL_ENCODED]; ?>">
                                             <?php echo $block->getBlockHtml('formkey')?>

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

@@ -16,8 +16,8 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form data-product-sku="<?php /* @escapeNotVerified */  echo $_product->getSku() ?>"
-          action="<?php /* @escapeNotVerified */ echo $block->getSubmitUrl($_product) ?>" method="post"
+    <form data-product-sku="<?php echo $block->escapeHtml($_product->getSku()) ?>"
+          action="<?php echo $block->escapeHtml($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="<?php /* @escapeNotVerified */ echo $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -236,7 +236,7 @@ public function getJsonConfig()
      *
      * @return array
      */
-    protected function getOptionImages()
+    private function getOptionImages()
     {
         $images = [];
         foreach ($this->getAllowProducts() as $product) {