Merge branch 'MAGETWO-34866' into MAGETWO-31368

Author: akaplya

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -22,7 +22,8 @@ define([
         ' +<%- finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd', // should be eliminated
-        priceFormat: {}
+        priceFormat: {},
+        isFixedPrice: false
     };
 
     $.widget('mage.priceBundle', {
@@ -116,17 +117,17 @@ define([
          */
         _applyQtyFix: function applyQtyFix() {
             var config = this.options.optionConfig;
-            _.each(config.options, function (option) {
-                _.each(option.selections, function (item) {
-                    if (item.priceType === '0') {
+            if (config.isFixedPrice) {
+                _.each(config.options, function (option) {
+                    _.each(option.selections, function (item) {
                         if (item.qty && item.qty !== 1) {
                             _.each(item.prices, function (price) {
                                 price.amount = price.amount / item.qty;
                             });
                         }
-                    }
+                    });
                 });
-            });
+            }
         },
 
         /**