Merge remote-tracking branch 'goinc/prepared-pull-request' into magento2

Author: Oleksii Korshenko

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js

@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*jshint browser:true jquery:true expr:true*/
+define([
+    'jquery',
+    'Magento_Catalog/catalog/type-events',
+    'Magento_Catalog/js/product/weight-handler'
+], function ($, productType, weight) {
+    'use strict';
+
+    return {
+
+        /**
+         * Constructor component
+         */
+        'Magento_Bundle/js/bundle-type-handler': function () {
+            this.bindAll();
+            this._initType();
+        },
+
+        /**
+         * Bind all
+         */
+        bindAll: function () {
+            $(document).on('changeTypeProduct', this._initType.bind(this));
+        },
+
+        /**
+         * Init type
+         * @private
+         */
+        _initType: function () {
+            if (
+                productType.type.real === 'bundle' &&
+                productType.type.current !== 'bundle' &&
+                !weight.isLocked()
+            ) {
+                weight.switchWeight();
+            }
+        }
+    };
+});

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php

@@ -301,25 +301,6 @@ public function getAttributesAllowedForAutogeneration()
         return $this->_productHelper->getAttributesAllowedForAutogeneration();
     }
 
-    /**
-     * Get data for JS (product type transition)
-     *
-     * @return string
-     */
-    public function getTypeSwitcherData()
-    {
-        return $this->jsonEncoder->encode(
-            [
-                'tab_id' => 'product_info_tabs_downloadable_items',
-                'weight_switcher' => '[data-role=weight-switcher]',
-                'product_has_weight_flag' => \Magento\Catalog\Model\Product\Edit\WeightResolver::HAS_WEIGHT,
-                'weight_id' => 'weight',
-                'current_type' => $this->getProduct()->getTypeId(),
-                'attributes' => $this->_getAttributes(),
-            ]
-        );
-    }
-
     /**
      * Get formed array with attribute codes and Apply To property
      *

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml

@@ -61,14 +61,14 @@
 <script>
 require([
     "jquery",
-    "Magento_Catalog/catalog/type-switcher",
+    "Magento_Catalog/catalog/type-events",
     "underscore",
     "mage/mage",
     "mage/backend/tabs",
     "domReady!"
 ], function($, TypeSwitcher){
     var $form = $('[data-form=edit-product]');
-    $form.data('typeSwitcher', new TypeSwitcher(<?php /* @escapeNotVerified */ echo $block->getTypeSwitcherData();?>).bindAll());
+    $form.data('typeSwitcher', TypeSwitcher.init());
 
     var scriptTagManager = (function($) {
         var hiddenPrefix = 'hidden',
@@ -407,3 +407,11 @@ require([
     });
 });
 </script>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Catalog/js/product/weight-handler": {},
+            "Magento_Catalog/catalog/apply-to-type-switcher": {}
+        }
+    }
+</script>

app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js

@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Catalog/js/product/weight-handler',
+    'Magento_Catalog/catalog/type-events'
+], function ($, weight, productType) {
+    'use strict';
+
+    return {
+
+        /**
+         * Bind event
+         */
+        bindAll: function () {
+            $('[data-form=edit-product] [data-role=tabs]').on(
+                'contentUpdated',
+                this._switchToTypeByApplyAttr.bind(this)
+            );
+
+            $('#product_info_tabs').on(
+                'beforePanelsMove tabscreate tabsactivate',
+                this._switchToTypeByApplyAttr.bind(this)
+            );
+
+            $(document).on('changeTypeProduct', this._switchToTypeByApplyAttr.bind(this));
+        },
+
+        /**
+         * Constructor component
+         */
+        'Magento_Catalog/catalog/apply-to-type-switcher': function () {
+            this.bindAll();
+            this._switchToTypeByApplyAttr();
+        },
+
+        /**
+         * Show/hide elements based on type
+         *
+         * @private
+         */
+        _switchToTypeByApplyAttr: function () {
+            $('[data-apply-to]:not(.removed)').each(function (index, element) {
+                var attrContainer = $(element),
+                    applyTo = attrContainer.data('applyTo') || [],
+                    $inputs = attrContainer.find('select, input, textarea');
+
+                if (applyTo.length === 0 || $.inArray(productType.type.current, applyTo) !== -1) {
+                    attrContainer.removeClass('not-applicable-attribute');
+                    $inputs.removeClass('ignore-validate');
+                } else {
+                    attrContainer.addClass('not-applicable-attribute');
+                    $inputs.addClass('ignore-validate');
+                }
+            });
+        }
+    };
+});

app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js

@@ -0,0 +1,67 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Catalog/js/product/weight-handler'
+], function ($, weight) {
+    'use strict';
+
+    return {
+        $type: $('#product_type_id'),
+
+        /**
+         * Init
+         */
+        init: function () {
+
+            if (weight.productHasWeight()) {
+                this.type = {
+                    virtual: 'virtual',
+                    real: this.$type.val() //simple, configurable
+                };
+            } else {
+                this.type = {
+                    virtual: this.$type.val(), //downloadable, virtual, grouped, bundle
+                    real: 'simple'
+                };
+            }
+            this.type.current = this.$type.val();
+
+            this.bindAll();
+        },
+
+        /**
+         * Bind all
+         */
+        bindAll: function () {
+            $(document).on('setTypeProduct', function (event, type) {
+                this.setType(type);
+            }.bind(this));
+
+            //direct change type input
+            this.$type.on('change', function () {
+                this.type.current = this.$type.val();
+                this._notifyType();
+            }.bind(this));
+        },
+
+        /**
+         * Set type
+         * @param {String} type - type product (downloadable, simple, virtual ...)
+         * @returns {*}
+         */
+        setType: function (type) {
+            return this.$type.val(type || this.type.real).trigger('change');
+        },
+
+        /**
+         * Notify type
+         * @private
+         */
+        _notifyType: function () {
+            $(document).trigger('changeTypeProduct', this.type);
+        }
+    };
+});

app/code/Magento/Catalog/view/adminhtml/web/catalog/type-switcher.js

@@ -373,7 +373,7 @@ define([
                     selectedClass = 'selected';
                 parent.toggleClass(selectedClass, $(this).prop('checked'));
             });
-            dialogElement.on('change', '[data-role=type-selector]', $.proxy(this._changeType, this));
+            dialogElement.on('change', '[data-role=type-selector]', $.proxy(this._notifyType, this));
             dialogElement.on('change', '[data-role=visibility-trigger]', $.proxy(function(e) {
                 this._changeVisibility(e, imageData);
             }, this));
@@ -401,7 +401,7 @@ define([
          * @param event
          * @private
          */
-        _changeType: function (event) {
+        _notifyType: function (event) {
             var $checkbox = $(event.currentTarget);
             var $imageContainer = $checkbox.closest('[data-role=dialog]').data('imageContainer');
             this.element.trigger('setImageType', {