Merge branch 'merchant_beta' of github.corp.magento.com:magento2/mage…

…nto2ce into merchant_beta
magento · Oct 30, 2015 · 14686fb · 14686fb
2 parents 3c7480a + 38de4f1
commit 14686fb
Show file tree

Hide file tree

Showing 128 changed files with 1,056 additions and 972 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+1.0.0-beta6
+=============
+* Fixed bugs:
+    * Fixed an issue with сustomer attribute creation in admin panel
+    * Fixed an issue with translation in html files using $t()
+    * Fixed an issue when save customer with custom attribute of type "file"
+    * Fixed an issue with container "page.bottom.container" in empty layout file
+    * Fixed an issue with rendering of static blocks grid on the store view
+    * Fixed an issue with rendering of multi-select customer attribute in admin panel
+    * Fixed an issue with categories import in a comma-separated format
+    * Fixed an issue with media import/export functionality
+    * Fixed an issue with category link management interface when getting assigned products 
+    * Fixed an issue with URL rewrite bulk assignment to website in multi-store mode
+    * Fixed an issue with website shopping cart rules applying
+    * Fixed an issue with limiter in My Account -> My Orders
+    * Fixed an issue with layout xml files that doesn't have translations
+* Various improvements:
+    * Validation error is shown on the focus out event of the email field during Checkout
+    * Added translations to layout xml files
+    * Various security improvements
+
 1.0.0-beta5
 =============
 * Fixed bugs:

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/module-media-storage": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/module-media-storage": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -3,18 +3,18 @@
   "description": "N/A",
   "require": {
     "php": "~5.5.0|~5.6.0",
-    "magento/module-catalog": "1.0.0-beta5",
-    "magento/module-catalog-inventory": "1.0.0-beta5",
-    "magento/module-eav": "1.0.0-beta5",
-    "magento/module-import-export": "1.0.0-beta5",
-    "magento/module-catalog-import-export": "1.0.0-beta5",
-    "magento/module-customer": "1.0.0-beta5",
-    "magento/module-store": "1.0.0-beta5",
-    "magento/framework": "1.0.0-beta5",
+    "magento/module-catalog": "1.0.0-beta6",
+    "magento/module-catalog-inventory": "1.0.0-beta6",
+    "magento/module-eav": "1.0.0-beta6",
+    "magento/module-import-export": "1.0.0-beta6",
+    "magento/module-catalog-import-export": "1.0.0-beta6",
+    "magento/module-customer": "1.0.0-beta6",
+    "magento/module-store": "1.0.0-beta6",
+    "magento/framework": "1.0.0-beta6",
     "magento/magento-composer-installer": "*"
   },
   "type": "magento2-module",
-  "version": "1.0.0-beta5",
+  "version": "1.0.0-beta6",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-sales": "1.0.0-beta5",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-quote": "1.0.0-beta5",
-        "magento/module-checkout": "1.0.0-beta5",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/module-payment": "1.0.0-beta5",
-        "magento/module-catalog": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-sales": "1.0.0-beta6",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-quote": "1.0.0-beta6",
+        "magento/module-checkout": "1.0.0-beta6",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/module-payment": "1.0.0-beta6",
+        "magento/module-catalog": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "proprietary"
     ],

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-directory": "1.0.0-beta5",
-        "magento/module-developer": "1.0.0-beta5",
-        "magento/module-eav": "1.0.0-beta5",
-        "magento/module-cron": "1.0.0-beta5",
-        "magento/module-theme": "1.0.0-beta5",
-        "magento/module-reports": "1.0.0-beta5",
-        "magento/module-sales": "1.0.0-beta5",
-        "magento/module-quote": "1.0.0-beta5",
-        "magento/module-catalog": "1.0.0-beta5",
-        "magento/module-user": "1.0.0-beta5",
-        "magento/module-backup": "1.0.0-beta5",
-        "magento/module-customer": "1.0.0-beta5",
-        "magento/module-translation": "1.0.0-beta5",
-        "magento/module-require-js": "1.0.0-beta5",
-        "magento/module-config": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-directory": "1.0.0-beta6",
+        "magento/module-developer": "1.0.0-beta6",
+        "magento/module-eav": "1.0.0-beta6",
+        "magento/module-cron": "1.0.0-beta6",
+        "magento/module-theme": "1.0.0-beta6",
+        "magento/module-reports": "1.0.0-beta6",
+        "magento/module-sales": "1.0.0-beta6",
+        "magento/module-quote": "1.0.0-beta6",
+        "magento/module-catalog": "1.0.0-beta6",
+        "magento/module-user": "1.0.0-beta6",
+        "magento/module-backup": "1.0.0-beta6",
+        "magento/module-customer": "1.0.0-beta6",
+        "magento/module-translation": "1.0.0-beta6",
+        "magento/module-require-js": "1.0.0-beta6",
+        "magento/module-config": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/module-cron": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/module-cron": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -3,27 +3,27 @@
   "description": "N/A",
   "require": {
     "php": "~5.5.0|~5.6.0",
-    "magento/module-config": "1.0.0-beta5",
-    "magento/module-store": "1.0.0-beta5",
-    "magento/module-checkout": "1.0.0-beta5",
-    "magento/module-catalog": "1.0.0-beta5",
-    "magento/module-sales": "1.0.0-beta5",
-    "magento/module-customer": "1.0.0-beta5",
-    "magento/module-payment": "1.0.0-beta5",
-    "magento/module-paypal": "1.0.0-beta5",
-    "magento/module-quote": "1.0.0-beta5",
-    "magento/module-backend": "1.0.0-beta5",
-    "magento/module-directory": "1.0.0-beta5",
-    "magento/module-theme": "1.0.0-beta5",
-    "magento/framework": "1.0.0-beta5",
+    "magento/module-config": "1.0.0-beta6",
+    "magento/module-store": "1.0.0-beta6",
+    "magento/module-checkout": "1.0.0-beta6",
+    "magento/module-catalog": "1.0.0-beta6",
+    "magento/module-sales": "1.0.0-beta6",
+    "magento/module-customer": "1.0.0-beta6",
+    "magento/module-payment": "1.0.0-beta6",
+    "magento/module-paypal": "1.0.0-beta6",
+    "magento/module-quote": "1.0.0-beta6",
+    "magento/module-backend": "1.0.0-beta6",
+    "magento/module-directory": "1.0.0-beta6",
+    "magento/module-theme": "1.0.0-beta6",
+    "magento/framework": "1.0.0-beta6",
     "braintree/braintree_php": "2.39.0",
     "magento/magento-composer-installer": "*"
   },
   "suggest": {
-    "magento/module-checkout-agreements": "1.0.0-beta5"
+    "magento/module-checkout-agreements": "1.0.0-beta6"
   },
   "type": "magento2-module",
-  "version": "1.0.0-beta5",
+  "version": "1.0.0-beta6",
   "license": [
     "proprietary"
   ],

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-catalog": "1.0.0-beta5",
-        "magento/module-tax": "1.0.0-beta5",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/module-sales": "1.0.0-beta5",
-        "magento/module-checkout": "1.0.0-beta5",
-        "magento/module-catalog-inventory": "1.0.0-beta5",
-        "magento/module-customer": "1.0.0-beta5",
-        "magento/module-catalog-rule": "1.0.0-beta5",
-        "magento/module-eav": "1.0.0-beta5",
-        "magento/module-config": "1.0.0-beta5",
-        "magento/module-gift-message": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
-        "magento/module-quote": "1.0.0-beta5",
-        "magento/module-media-storage": "1.0.0-beta5",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-catalog": "1.0.0-beta6",
+        "magento/module-tax": "1.0.0-beta6",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/module-sales": "1.0.0-beta6",
+        "magento/module-checkout": "1.0.0-beta6",
+        "magento/module-catalog-inventory": "1.0.0-beta6",
+        "magento/module-customer": "1.0.0-beta6",
+        "magento/module-catalog-rule": "1.0.0-beta6",
+        "magento/module-eav": "1.0.0-beta6",
+        "magento/module-config": "1.0.0-beta6",
+        "magento/module-gift-message": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
+        "magento/module-quote": "1.0.0-beta6",
+        "magento/module-media-storage": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "1.0.0-beta5"
+        "magento/module-webapi": "1.0.0-beta6"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-catalog": "1.0.0-beta5",
-        "magento/module-import-export": "1.0.0-beta5",
-        "magento/module-catalog-import-export": "1.0.0-beta5",
-        "magento/module-bundle": "1.0.0-beta5",
-        "magento/module-eav": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-catalog": "1.0.0-beta6",
+        "magento/module-import-export": "1.0.0-beta6",
+        "magento/module-catalog-import-export": "1.0.0-beta6",
+        "magento/module-bundle": "1.0.0-beta6",
+        "magento/module-eav": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-page-cache": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-page-cache": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "1.0.0-beta5",
-        "magento/module-customer": "1.0.0-beta5",
-        "magento/module-checkout": "1.0.0-beta5",
-        "magento/module-backend": "1.0.0-beta5",
-        "magento/framework": "1.0.0-beta5",
+        "magento/module-store": "1.0.0-beta6",
+        "magento/module-customer": "1.0.0-beta6",
+        "magento/module-checkout": "1.0.0-beta6",
+        "magento/module-backend": "1.0.0-beta6",
+        "magento/framework": "1.0.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "1.0.0-beta5",
+    "version": "1.0.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
@@ -36,20 +36,20 @@ public function __construct(
     public function getAssignedProducts($categoryId)
     {
         $category = $this->categoryRepository->get($categoryId);
-        $productsPosition = $category->getProductsPosition();
 
-        /** @var \Magento\Framework\Data\Collection\AbstractDb $products */
+        /** @var \Magento\Catalog\Model\Resource\Product\Collection $products */
         $products = $category->getProductCollection();
+        $products->addFieldToSelect('position');
 
         /** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface[] $links */
         $links = [];
 
         /** @var \Magento\Catalog\Model\Product $product */
-        foreach ($products->getItems() as $productId => $product) {
+        foreach ($products->getItems() as $product) {
             /** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface $link */
             $link = $this->productLinkFactory->create();
             $link->setSku($product->getSku())
-                ->setPosition($productsPosition[$productId])
+                ->setPosition($product->getData('cat_index_position'))
                 ->setCategoryId($category->getId());
             $links[] = $link;
         }

diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -671,4 +671,23 @@ public function getAnchorsAbove(array $filterIds, $storeId = 0)
 
         return $this->_getReadAdapter()->fetchCol($select);
     }
+
+    /**
+     * Get positions of associated to category products
+     *
+     * @param \Magento\Catalog\Model\Category $category
+     * @return array
+     */
+    public function getProductsPosition($category)
+    {
+        $select = $this->_getReadAdapter()->select()->from(
+            $this->getTable('catalog_category_product'),
+            ['product_id', 'position']
+        )->where(
+            'category_id = :category_id'
+        );
+        $bind = ['category_id' => (int)$category->getId()];
+
+        return $this->_getReadAdapter()->fetchPairs($select, $bind);
+    }
 }