Merge pull request #319 from magento-goinc/MAGETWO-37718

[MX][Virtual Team, GoInc] Public GitHub Issues, Bug Fixes

Author: orlangur

CHANGELOG.md

@@ -9,7 +9,7 @@
     * Refactored controller actions in the Product area
     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
 * Data Migration Tool
-    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce, "Data Migration Tool repository")
+    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
 * Fixed bugs
     * Fixed an issue where error appeared during placing order with virtual product
     * Fixed an issue where billing and shipping sections didn't contain address information on order print

app/code/Magento/Bundle/CustomerData/BundleItem.php

@@ -18,7 +18,6 @@
         "magento/framework": "0.74.0-beta9",
         "magento/module-quote": "0.74.0-beta9",
         "magento/module-media-storage": "0.74.0-beta9",
-        "magento/module-msrp": "0.74.0-beta9",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {

app/code/Magento/Bundle/composer.json

@@ -16,11 +16,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="bundle" xsi:type="string">Magento\Bundle\CustomerData\BundleItem</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/Bundle/etc/frontend/di.xml

@@ -194,6 +194,9 @@ protected function _prepareForm()
         );
 
         $this->_eventManager->dispatch('product_attribute_form_build', ['form' => $form]);
+        if ($attributeObject->getId() && !$attributeObject->getIsUserDefined()) {
+            $form->getElement('is_global')->setDisabled(1);
+        }
         $this->setForm($form);
         return $this;
     }

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

@@ -142,11 +142,15 @@ public function execute()
             $category->setData('use_post_data_config', $this->getRequest()->getPost('use_config'));
 
             try {
+                $categoryResource = $category->getResource();
+                if ($category->hasCustomDesignTo()) {
+                    $categoryResource->getAttribute('custom_design_from')->setMaxValue($category->getCustomDesignTo());
+                }
                 $validate = $category->validate();
                 if ($validate !== true) {
                     foreach ($validate as $code => $error) {
                         if ($error === true) {
-                            $attribute = $category->getResource()->getAttribute($code)->getFrontend()->getLabel();
+                            $attribute = $categoryResource->getAttribute($code)->getFrontend()->getLabel();
                             throw new \Magento\Framework\Exception\LocalizedException(
                                 __('Attribute "%1" is required.', $attribute)
                             );

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Model\Product\Attribute\Backend;
+namespace Magento\Catalog\Model\Attribute\Backend;
 
 /**
  *

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Startdate.php renamed to app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php

@@ -15,7 +15,6 @@
 use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SortOrder;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
@@ -219,6 +218,9 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
             if ($editMode) {
                 $product->setData('_edit_mode', true);
             }
+            if ($storeId !== null) {
+                $product->setData('store_id', $storeId);
+            }
             $product->load($productId);
             $this->instances[$sku][$cacheKey] = $product;
             $this->instancesById[$product->getId()][$cacheKey] = $product;
@@ -234,7 +236,6 @@ public function getById($productId, $editMode = false, $storeId = null, $forceRe
         $cacheKey = $this->getCacheKey(func_get_args());
         if (!isset($this->instancesById[$productId][$cacheKey]) || $forceReload) {
             $product = $this->productFactory->create();
-
             if ($editMode) {
                 $product->setData('_edit_mode', true);
             }

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -590,8 +590,7 @@ protected function _createCollectionDataSelect($sorted = true, $optionalAttribut
                 $select->joinLeft(
                     [$tableDefault => $attribute->getBackend()->getTable()],
                     sprintf(
-                        '%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d' .
-                        ' AND %1$s.entity_type_id=e.entity_type_id AND %1$s.store_id=%3$d',
+                        '%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d AND %1$s.store_id=%3$d',
                         $tableDefault,
                         $attribute->getId(),
                         \Magento\Store\Model\Store::DEFAULT_STORE_ID
@@ -600,8 +599,7 @@ protected function _createCollectionDataSelect($sorted = true, $optionalAttribut
                 )->joinLeft(
                     [$tableStore => $attribute->getBackend()->getTable()],
                     sprintf(
-                        '%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d' .
-                        ' AND %1$s.entity_type_id=e.entity_type_id AND %1$s.store_id=%3$d',
+                        '%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d AND %1$s.store_id=%3$d',
                         $tableStore,
                         $attribute->getId(),
                         $this->getStoreId()