MAGETWO-77744: [Magento Cloud] - Error message when uploading unsupported file format

Author: danielrenaud

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

@@ -62,34 +62,28 @@ define([
          * @param {Object} form
          */
         submitForm: function (form) {
-            var addToCartButton, self = this;
-
-            if (form.has('input[type="file"]').length && form.find('input[type="file"]').val() !== '') {
-                self.element.off('submit');
-                // disable 'Add to Cart' button
-                addToCartButton = $(form).find(this.options.addToCartButtonSelector);
-                addToCartButton.prop('disabled', true);
-                addToCartButton.addClass(this.options.addToCartButtonDisabledClass);
-                form.submit();
-            } else {
-                self.ajaxSubmit(form);
-            }
+            this.ajaxSubmit(form);
         },
 
         /**
          * @param {String} form
          */
         ajaxSubmit: function (form) {
-            var self = this;
+            var self = this,
+                formData;
 
             $(self.options.minicartSelector).trigger('contentLoading');
             self.disableAddToCartButton(form);
+            formData = new FormData(form[0]);
 
             $.ajax({
                 url: form.attr('action'),
-                data: form.serialize(),
+                data: formData,
                 type: 'post',
                 dataType: 'json',
+                cache: false,
+                contentType: false,
+                processData: false,
 
                 /** @inheritdoc */
                 beforeSend: function () {
@@ -125,7 +119,12 @@ define([
                             parameters.push(eventData.redirectParameters.join('&'));
                             res.backUrl = parameters.join('#');
                         }
-                        window.location = res.backUrl;
+                        window.location.href = res.backUrl;
+
+                        // page does not reload when anchor (#) is added
+                        if (res.backUrl.indexOf('#') !== -1) {
+                            window.location.reload();
+                        }
 
                         return;
                     }

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -926,6 +926,8 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                         return $result;
                     }
                 }
+            } elseif (is_string($result)) {
+                return __($result)->render();
             }
         }
 

app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml

@@ -22,6 +22,7 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
             <div class="control">
                 <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
                         data-selector="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
+                        data-attribute-code="<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                         data-validate="{required:true}"
                         id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                         class="super-attribute-select">
@@ -38,6 +39,9 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
                     "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                         'Magento_ConfigurableProduct') ?: 'replace'; ?>"
                 }
+            },
+            "*" : {
+                "Magento_ConfigurableProduct/js/catalog-add-to-cart": {}
             }
         }
     </script>

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

@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+require([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
+        $(data.form).find('select[name*="super"]').each(function (index, item) {
+            var $item = $(item);
+
+            data.redirectParameters.push($item.attr('data-attribute-code') + '=' + $item.val());
+        });
+    });
+});

app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml

@@ -20,6 +20,9 @@
                 "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                     'Magento_ConfigurableProduct') ?: 'replace'; ?>"
             }
+        },
+        "*" : {
+            "Magento_Swatches/js/catalog-add-to-cart": {}
         }
     }
 </script>