Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch

Author: mazhalai

.gitignore

@@ -31,6 +31,8 @@ atlassian*
 !/pub/media/customer/.htaccess
 /pub/media/downloadable/*
 !/pub/media/downloadable/.htaccess
+/pub/media/import/*
+!/pub/media/import/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

.travis.yml

@@ -9,6 +9,11 @@ env:
   - TEST_SUITE=integration_integrity
   - TEST_SUITE=static_phpcs
   - TEST_SUITE=static_annotation
+cache:
+  apt: true
+  directories:
+    - $HOME/.composer/cache
+    - $HOME/.cache/bin
 matrix:
   exclude:
     - php: 5.6
@@ -18,6 +23,16 @@ matrix:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix
+  - sh -c 'if [ "$CASHER_DIR" ]; then
+         if [ -x $HOME/.cache/bin/composer ]; then
+           $HOME/.cache/bin/composer self-update; echo '';
+         else
+           mkdir -p $HOME/.cache/bin;
+           curl --connect-timeout 30 -sS https://getcomposer.org/installer \
+           | php -- --install-dir $HOME/.cache/bin/ --filename composer;
+         fi
+       fi'
+  - export PATH="$HOME/.cache/bin:$PATH"
 before_script:
   # Mock mail
   - sudo service postfix stop
@@ -46,7 +61,7 @@ before_script:
   # Change memory_limit for travis
   - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv rehash;
-  - composer install --no-interaction --dev
+  - composer install --no-interaction --prefer-dist
 script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
@@ -59,4 +74,4 @@ script:
   # Static tests [Code Style]
   - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

CHANGELOG.md

@@ -1,42 +1,139 @@
+0.74.0-beta16
+=============
+* Framework improvements:
+    * Improved declaration of JS widgets with mixins node
+    * Optimized Magento\Framework\View\Element\Template for production mode
+    * Added color picker JS library
+* Various improvements:
+    * Implemented enhanced checkout flow
+    * Increased security of search filters
+    * Added price variation caching based on WEEE
+    * Updated adapter in payment gateway
+    * Data version control was implemented on Customer and Quote modules to reduce number of unnecessary model saves
+    * Optimized Magento\PageCache\Model\Observer\ProcessLayoutRenderElement::execute
+    * Added event to make an ability to add elements on a main tab of attribute editing page
+    * Email markup duplication is eliminated and email content management is simplified
+    * Implemented and ability to update/replace and export advanced product prices
+    * Added import history
+    * Implemented and ability to export configurable products
+* Payment improvements:
+    * Moved PayPal solutions back to CE
+    * PayPal Payments Standard is updated to PayPal Express Checkout API
+    * Improved conflict resolution rules for PayPal configuration
+* Tests:
+    * Increased timeout for HTTP requests in api-functional test framework to avoid error "HTTP request failed"
+    * Increased unit test coverage for Reports, CatalogRule, Config and CurrencySymbol modules
+    * Functional tests maintenance for Tax, Sales, Reports modules
+    * Created fixture generation scripts for functional tests
+    * Fixed CheckoutWithGiftMessagesTest functional test
+* Fixed bugs:
+    * Fixed wrong redirect after adding to compare, wish list or cart from private content blocks
+    * Fixed an issue where tax information was not saved in orders
+    * Fixed an issue where total amount was not set in the correct place
+    * Fixed an issue where product options details were missing while adding to wish list
+    * Fixed an issue with empty customer first name and last name when new address is added on backend
+    * Fixed an issue where it was not possible to create customer from backend if there was custom attribute
+    * Fixed an issue where email could not be retrieved from Quote address after adding an address in backend order creation
+    * Fixed XSS in order details
+* GitHub issues and requests:
+    * [#1389](https://github.com/magento/magento2/pull/1389) -- Replaced string check with simpler logic
+    * [#1412](https://github.com/magento/magento2/pull/1412) -- Fix typo - change getChildhtml to getChildHtml
+    * [#1415](https://github.com/magento/magento2/pull/1415) -- Add placeholder containers to invoice and shipment creation sections
+
+0.74.0-beta15
+=============
+* Framework improvements:
+    * Introduced Drag&Drop Columns functionality in scope of Enhanced Data Grids on CMS
+    * Improved Column Actions functionality in scope of Enhanced Data Grids on CMS
+    * Adapted Payment\Gateway framework to client requirements
+    * Removed 'field_expr' option from filters
+    * Added product details renderer list support on Catalog category page
+    * Security: Clickjacking solution - introduced X-Frame-Options
+    * Gift message was moved to shopping cart
+    * Improved simple products export
+    * Separated import of advanced prices
+    * Changed 'updated_at' filter for products export
+    * Added the link with sample product import file
+    * Cleared and improved the  messages and names in different modules
+    * Added mbstring extension as a requirement
+* Tests:
+    * Increased test coverage for the CatalogInventory, Email and Newsletter modules
+    * Added wait to form element before filling a value in functional tests
+    * Increased test coverage of Reports module
+    * Functional tests were fixed and maintained
+* Fixed bugs:
+    * Fixed loading of images from database media storage with separate connection
+    * Eliminated duplication of ComposerInformation class in Magento Framework and Setup Application
+    * Fixed an error message format inconsistency in theme uninstall command
+    * Fixed an issue where incorrect action name checks led to customer info leak
+    * Fixed an issue where /magento_version exposed too detailed version information
+    * Fixed an issue where generate data failed when table prefix exceeded length of 5
+    * Fixed an issue where product options were displayed not styled on "Edit Product from Wishlist" Frontend page
+    * Fixed an issue where payment information was displayed broken on "Order Management" Backend page forms
+    * Fixed an issue where admin panel pop-ups contained lots of empty space
+    * Fixed an issue where Customer account form was displayed broken
+    * Fixed an issue where all text fields were invisible in Backend "Add New Customer" page
+    * Fixed XSS issues in Magento - wishlist sending
+    * Fixed an issue where it was unable to specify all values of "Multiple Select" Product Custom Option to purchase
+    * Fixed an issue where setting a permission for 'ALL Groups' produced an error if other permissions existed
+    * Fixed an issue where stock was not updated when Stock indexer was in Update on Schedule mode
+    * Fixed an issue where it was not possible to update stock items of product using API service
+    * Fixed an issue where Customer review changes in backend were not reflected in frontend until cache was cleared
+    * Fixed an issue where cache was not updated when changing stock status using mass action
+    * Fixed an issue where Stock Items API service to return low stock information did not return correct results
+    * Fixed an issue where found records in global search in Backend could not be selected via keyboard
+    * Fixed an issue where Category menu items went out of screen when page side was reached
+    * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
+    * Fixed an issue where popup header was our of window range while creating group product
+    * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
+    * Fixed an ability to edit the Order from Admin panel
+    * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout
+    * Fixed an issue where Products were not displayed correctly across all storeviews of the catalog
+* GitHub issues:
+    * [#1378](https://github.com/magento/magento2/issues/1319) -- jquery-cookie.js is not published by deploy tool in production mode
+    * [#1314](https://github.com/magento/magento2/pull/1314)-- Fixed a bug where type attribute for tag button was missing
+    * [#1354](https://github.com/magento/magento2/pull/1354) -- Add gitter.im badge to ReadMe.
+    * [#1378](https://github.com/magento/magento2/pull/1378) -- Fix incorrect js filename
+
 0.74.0-beta14
 =============
 * Framework improvements:
-    * Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall <moduleName>)
-    * Introduced an ability to uninstall themes (bin/magento theme:uninstall <themeName>)
+    * Introduced an ability to uninstall modules which were installed via composer (bin/magento module:uninstall 'moduleName')
+    * Introduced an ability to uninstall themes (bin/magento theme:uninstall 'themeName')
     * Introduced an ability to backup and rollback DB and Media via CLI (bin/magento setup:backup, options are --code, --db or --media)
-    * Introduced an ability to uninstall language packages (bin/magento i18n:uninstall <languagePack>)
-    * Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache 
+    * Introduced an ability to uninstall language packages (bin/magento i18n:uninstall 'languagePack')
+    * Introduced API notation for the following modules: Backend, Backup, Cron, Log, PageCache
     * Added join processors to search services, joined config for services with extension attributes
-    * Renamed hidden_tax to discount_tax_compensation 
+    * Renamed hidden_tax to discount_tax_compensation
     * The customer address entity table was transformed from EAV into a flat model to minimize database operations
 * Fixed bugs:
     * Fixed an issue where Setup Wizard failed on readiness check when Magento was deployed by composer create-project
-    * Fixed the local file path disclosure when trying to browse image cache directory  
-    * Fixed an issue where development errors resulted in too many redirects 
-    * Fixed an integration test failure in Reports ViewedTest 
-    * Fixed an issue where it was impossible to save existent Grouped Product with no child items 
-    * Fixed an issue where message "We don't have as many "conf1" as you requested" appeared 
-    * Fixed an issue where second product from bundle product was ordered as separate item after checkout 
-    * Fixed an issue where configs for payments and shippings were not encrypted 
-    * Fixed an issue where Table Rates shipping method did not work 
-    * Fixed an issue where admin could not set locale properly on Account page 
-    * Fixed incomplete generated results of single tenant compiler 
-    * Fixed an issue with full page caching where one set of prices was cached for all customers 
-    * Fixed incorrect urls for private content 
-    * Fixed an issue where it was not possible to assign a product link to another product using API 
-    * Fixed an issue where zipcode was not displayed as required field on Create New Order page 
-    * Fixed the Sample Data re-installation 
+    * Fixed the local file path disclosure when trying to browse image cache directory
+    * Fixed an issue where development errors resulted in too many redirects
+    * Fixed an integration test failure in Reports ViewedTest
+    * Fixed an issue where it was impossible to save existent Grouped Product with no child items
+    * Fixed an issue where message "We don't have as many "conf1" as you requested" appeared
+    * Fixed an issue where second product from bundle product was ordered as separate item after checkout
+    * Fixed an issue where configs for payments and shipping providers were not encrypted
+    * Fixed an issue where Table Rates shipping method did not work
+    * Fixed an issue where admin could not set locale properly on Account page
+    * Fixed incomplete generated results of single tenant compiler
+    * Fixed an issue with full page caching where one set of prices was cached for all customers
+    * Fixed incorrect urls for private content
+    * Fixed an issue where it was not possible to assign a product link to another product using API
+    * Fixed an issue where zip code was not displayed as required field on Create New Order page
+    * Fixed the Sample Data re-installation
     * Fixed random fails on inventory tab for test CreateSimpleProductEntityTest
 * Tests:
-    * Covered various modules with unit tests 
+    * Covered various modules with unit tests
     * Functional tests fixed and maintained
 * GitHub issues:
     * [#1156](https://github.com/magento/magento2/pull/1156) -- Moves common code to all auto-generated Interceptor classes into a trait
     * [#1206](https://github.com/magento/magento2/pull/1206) -- Allow modules to live outside of app/code directory
     * [#1245](https://github.com/magento/magento2/pull/1245) -- Unable to save product per website wise
     * [#1347](https://github.com/magento/magento2/pull/1347) -- Fixed failing Install during integration tests (MAGETWO-38482)
     * [#1368](https://github.com/magento/magento2/pull/1368) -- Fix typo in getCurrentCategoryKey
-    
+
 0.74.0-beta13
 =============
 * Framework improvements:
@@ -146,14 +243,14 @@
     * Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
 * Fixed bugs:
     * Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
-    * Fixed an issue where interceptors were Generated with Invalid __wakeup() 
+    * Fixed an issue where interceptors were Generated with Invalid __wakeup()
     * Fixed an issue where redirect on the current page was not working in certain conditions
     * Fixed an issue where first store could not be selected on frontend
     * Fixed an issue with performance toolkit category creation
     * Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
     * Fixed an issue where fatal error occurred on Abandoned Carts report grid
     * Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
-    * Fixed an issue where email was not required during Guest Checkout 
+    * Fixed an issue where email was not required during Guest Checkout
     * Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
     * Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
     * Fixed bug with broken JS i18n
@@ -473,7 +570,7 @@
     * The page and block data and repository interfaces
     * Updated the public API list
 * Framework improvements
-    * Improved the profile generator 
+    * Improved the profile generator
     * Introduced the new environment for Jasmine tests
 * Design
     * Inverted the new admin area styles scope, clean up the old styles

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=master)](https://travis-ci.org/magento/magento2)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta14",
-        "magento/module-backend": "0.74.0-beta14",
-        "magento/module-media-storage": "0.74.0-beta14",
-        "magento/framework": "0.74.0-beta14",
+        "magento/module-store": "0.74.0-beta16",
+        "magento/module-backend": "0.74.0-beta16",
+        "magento/module-media-storage": "0.74.0-beta16",
+        "magento/framework": "0.74.0-beta16",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta14",
+    "version": "0.74.0-beta16",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
+
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
+use Magento\Catalog\Model\Product as CatalogProduct;
+
+class GetFilter extends ExportController
+{
+    /**
+     * Get grid-filter of entity attributes action.
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute()
+    {
+        $data = $this->getRequest()->getParams();
+        if ($this->getRequest()->isXmlHttpRequest() && $data) {
+            try {
+                if ($data['entity'] == ExportAdvancedPricing::ENTITY_ADVANCED_PRICING) {
+                    $data['entity'] = CatalogProduct::ENTITY;
+                }
+                /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+                $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+                /** @var $attrFilterBlock \Magento\ImportExport\Block\Adminhtml\Export\Filter */
+                $attrFilterBlock = $resultLayout->getLayout()->getBlock('export.filter');
+                /** @var $export \Magento\ImportExport\Model\Export */
+                $export = $this->_objectManager->create('Magento\ImportExport\Model\Export');
+                $export->setData($data);
+                $export->filterAttributeCollection(
+                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                );
+                return $resultLayout;
+            } catch (\Exception $e) {
+                $this->messageManager->addError($e->getMessage());
+            }
+        } else {
+            $this->messageManager->addError(__('Please correct the data sent.'));
+        }
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $resultRedirect->setPath('adminhtml/*/index');
+        return $resultRedirect;
+    }
+}