Merge remote-tracking branch 'mainline/develop' into publication

Conflicts:
	app/code/Magento/Backend/composer.json
	app/code/Magento/Bundle/composer.json
	app/code/Magento/Catalog/composer.json
	app/code/Magento/CatalogInventory/composer.json
	app/code/Magento/Checkout/composer.json
	app/code/Magento/ConfigurableProduct/composer.json
	app/code/Magento/Customer/composer.json
	app/code/Magento/Dhl/composer.json
	app/code/Magento/Downloadable/composer.json
	app/code/Magento/Fedex/composer.json
	app/code/Magento/GiftMessage/composer.json
	app/code/Magento/GroupedProduct/composer.json
	app/code/Magento/Msrp/composer.json
	app/code/Magento/Multishipping/composer.json
	app/code/Magento/OfflineShipping/composer.json
	app/code/Magento/Payment/composer.json
	app/code/Magento/Persistent/composer.json
	app/code/Magento/Reports/composer.json
	app/code/Magento/Sales/composer.json
	app/code/Magento/SalesRule/composer.json
	app/code/Magento/Shipping/composer.json
	app/code/Magento/Tax/composer.json
	app/code/Magento/Ups/composer.json
	app/code/Magento/Usps/composer.json
	app/code/Magento/Weee/composer.json
	composer.lock

Author: vpelipenko

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -14,7 +14,7 @@
         <?php endforeach;?>
     </ul>
 </div>
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "jquery/ui"

app/code/Magento/Backend/Block/Widget/Form/Container.php

@@ -178,7 +178,7 @@ public function getFormHtml()
     public function getFormInitScripts()
     {
         if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
-            return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
+            return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
         }
         return '';
     }
@@ -189,7 +189,7 @@ public function getFormInitScripts()
     public function getFormScripts()
     {
         if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
-            return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
+            return '<script>' . implode("\n", $this->_formScripts) . '</script>';
         }
         return '';
     }

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

@@ -120,7 +120,7 @@ protected function _toHtml()
         if (!$this->_depends) {
             return '';
         }
-        return '<script type="text/javascript">
+        return '<script>
             require(["mage/adminhtml/form"], function(){
         new FormElementDependenceController(' .
             $this->_getDependsJson() .

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -86,7 +86,7 @@ public function getHtml()
             ' value="' .
             $this->_localeResolver->getLocaleCode() .
             '"/>';
-        $html .= '<script type="text/javascript">
+        $html .= '<script>
             require(["jquery", "mage/calendar"], function($){
                 $("#' .
             $htmlId .

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -130,7 +130,7 @@ public function getHtml()
             ) . '/>' . '</div></div>';
         $html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
             . $this->_localeResolver->getLocaleCode() . '"/>';
-        $html .= '<script type="text/javascript">
+        $html .= '<script>
             require(["jquery", "mage/calendar"],function($){
                     $("#' . $htmlId . '_range").dateRange({
                         dateFormat: "' . $format . '",

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -10,7 +10,7 @@
 /**
  * Grid widget massaction block
  *
- * @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
+ * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <core@magentocommerce.com>
  */

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -8,7 +8,7 @@
 /**
  * Grid widget massaction block
  *
- * @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
+ * @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
  * @method boolean getHideFormElement()
  * @author      Magento Core Team <core@magentocommerce.com>
  * @deprecated support Magento 1.x grid massaction implementation

app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedIframe.php

@@ -32,7 +32,7 @@ public function __construct(
      */
     protected function _getDeniedIframe()
     {
-        return '<script type="text/javascript">parent.window.location = \''
+        return '<script>parent.window.location = \''
             . $this->_helper->getHomePageUrl() . '\';</script>';
     }
 

app/code/Magento/Backend/Model/Session/Quote.php

@@ -28,7 +28,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
     /**
      * Quote model object
      *
-     * @var \Magento\Sales\Model\Quote
+     * @var \Magento\Quote\Model\Quote
      */
     protected $_quote;
 
@@ -59,7 +59,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
     /**
      * Sales quote repository
      *
-     * @var \Magento\Sales\Model\QuoteRepository
+     * @var \Magento\Quote\Model\QuoteRepository
      */
     protected $quoteRepository;
 
@@ -83,7 +83,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param CustomerRepositoryInterface $customerRepository
-     * @param \Magento\Sales\Model\QuoteRepository $quoteRepository
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GroupManagementInterface $groupManagement
@@ -98,7 +98,7 @@ public function __construct(
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         CustomerRepositoryInterface $customerRepository,
-        \Magento\Sales\Model\QuoteRepository $quoteRepository,
+        \Magento\Quote\Model\QuoteRepository $quoteRepository,
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         GroupManagementInterface $groupManagement
@@ -127,7 +127,7 @@ public function __construct(
     /**
      * Retrieve quote model object
      *
-     * @return \Magento\Sales\Model\Quote
+     * @return \Magento\Quote\Model\Quote
      */
     public function getQuote()
     {

app/code/Magento/Backend/composer.json

@@ -11,6 +11,7 @@
         "magento/module-theme": "0.42.0-beta4",
         "magento/module-reports": "0.42.0-beta4",
         "magento/module-sales": "0.42.0-beta4",
+        "magento/module-quote": "0.42.0-beta4",
         "magento/module-catalog": "0.42.0-beta4",
         "magento/module-user": "0.42.0-beta4",
         "magento/module-backup": "0.42.0-beta4",

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -76,7 +76,7 @@
                 <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
                 <block class="Magento\Backend\Block\Page\Footer" name="version" as="version">
                     <arguments>
-                        <argument name="bugreport_url" xsi:type="string">http://www.magentocommerce.com/bug-tracking</argument>
+                        <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
                     </arguments>
                 </block>
             </container>

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

@@ -38,7 +38,7 @@
                         </div>
                     </fieldset>
                 </form>
-                <script type="text/javascript">
+                <script>
                     function initForm($){
                         $('#login-form').form().validation();
                     }

app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml

@@ -45,7 +45,7 @@ $numColumns = sizeof($this->getColumns());
     </table>
 </div>
 <?php if ($this->canDisplayContainer()): ?>
-<script type="text/javascript">
+<script>
 var deps = ['mage/adminhtml/grid'];
 
 <?php if (strpos($this->getRowClickCallback(), 'order.') !== false): ?>

app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml

@@ -6,7 +6,7 @@
 ?>
 
 <?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
-<script type="text/javascript">
+<script>
 function changeDiagramsPeriod(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
 <?php foreach ($this->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>

app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml

@@ -31,7 +31,7 @@
     <?php endforeach; ?>
 </select>
 </p>
-<script type="text/javascript">
+<script>
     function switchStore(obj){
         if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
             var selectionType = 'website';

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

@@ -25,7 +25,7 @@
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "mage/translate",

app/code/Magento/Backend/view/adminhtml/templates/menu.phtml

@@ -10,5 +10,5 @@
 
 <?php /* @TODO: find the place for the help ?>
 <a id="page-help-link" href="<?php echo $this->helper('Magento\Backend\Helper\Data')->getPageHelpUrl() ?>"><?php echo __('Get help for this page') ?></a>
-<script type="text/javascript">$('page-help-link').target = 'magento_page_help'</script>
+<script>$('page-help-link').target = 'magento_page_help'</script>
 <?php */ ?>

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -14,7 +14,7 @@
  */
 ?>
 
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "jquery/ui"

app/code/Magento/Backend/view/adminhtml/templates/page/js/head_scripts.phtml

@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 ?>
-<script type="text/javascript">
+<script>
     Ext.BLANK_IMAGE_URL = BLANK_IMG;
     Ext.UpdateManager.defaults.loadScripts = false;
     Ext.UpdateManager.defaults.disableCaching = true;
 </script>
 
 <script type="text/javascript" src="<?php echo $this->getViewFileUrl('tiny_mce/tiny_mce_src.js') ?>"></script>
 
-<script type="text/javascript">
+<script>
     Fieldset.addToPrefix(<?php echo $this->helper('Magento\Backend\Helper\Data')->getCurrentUserId() ?>);
 </script>

app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<script type="text/javascript">
+<script>
     var BLANK_URL = '<?php echo $this->getViewFileUrl('blank.html') ?>';
     var BLANK_IMG = '<?php echo $this->getViewFileUrl('spacer.gif') ?>';
     var BASE_URL = '<?php echo $this->getUrl('*') ?>';

app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml

@@ -42,7 +42,7 @@ $_data = [
     'Please wait, loading...' => __('Please wait, loading...'),
 ];
 ?>
-<script type="text/javascript">
+<script>
 require(["jquery","mage/translate"], function($){
     $.mage.translate.add(<?php echo Zend_Json::encode($_data) ?>)
 });

app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml

@@ -9,7 +9,7 @@
     <div class="control">
         <?php echo $this->getLocaleSelect(); ?>
     </div>
-    <script type="text/javascript">
+    <script>
         function setInterfaceLanguage(event) {
             var elem = Event.element(event);
             if (elem) {

app/code/Magento/Backend/view/adminhtml/templates/page/system/config/robots/reset.phtml

@@ -11,7 +11,7 @@
 $coreHelper = $this->helper('Magento\Core\Helper\Data');
 ?>
 
-<script type="text/javascript">
+<script>
     function resetRobotsToDefault()
     {
         $('design_search_engine_robots_custom_instructions').value = <?php

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -120,7 +120,7 @@
     <?php echo $this->getHintHtml() ?>
 </div>
 
-<script type="text/javascript">
+<script>
 require(['jquery'], function(jQuery){
 
     (function($) {

app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml

@@ -17,7 +17,7 @@
 <form action="<?php echo $this->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
     <?php echo $this->getBlockHtml('formkey')?>
 
-    <script type="text/javascript">
+    <script>
     function setCacheAction(id, button) {
         $(id).value = button.id;
         configForm.submit();
@@ -79,7 +79,7 @@
         </fieldset>
     </div>
 </form>
-<script type="text/javascript">
+<script>
     require(["jquery","mage/mage"],function($){
        $('#config-edit-form').mage('form').mage('validation');
     });

app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml

@@ -19,7 +19,7 @@
         <?php echo $this->getChildHtml('form') ?>
     </div>
 </form>
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "jquery/jquery.hashchange",

app/code/Magento/Backend/view/adminhtml/templates/system/config/form/field/array.phtml

@@ -33,7 +33,7 @@ $_colspan = $this->isAddAfter() ? 2 : 1;
     </table>
     <input type="hidden" name="<?php echo $this->getElement()->getName(); ?>[__empty]" value="" />
 
-    <script type="text/javascript">
+    <script>
 
         // create row creator
         var arrayRow<?php echo $_htmlId ?> = {

app/code/Magento/Backend/view/adminhtml/templates/system/config/js.phtml

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<script type="text/javascript">
+<script>
 //<![CDATA[
 var freeModel = Class.create();
 freeModel.prototype = {

app/code/Magento/Backend/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml

@@ -7,7 +7,7 @@
 
 <?php /* @var $this \Magento\Backend\Block\System\Config\System\Storage\Media\Synchronize */ ?>
 
-<script type="text/javascript">
+<script>
 require([
     'jquery',
     'prototype',

app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml

@@ -7,7 +7,7 @@
 <form action="<?php echo $this->getSaveUrl() ?>" method="post" id="design-edit-form">
     <?php echo $this->getBlockHtml('formkey')?>
 </form>
-<script type="text/javascript">
+<script>
 require([
     "jquery",
     "mage/mage"

app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<script type="text/javascript">
+<script>
 //<![CDATA[
 var CountryModel = Class.create();
 CountryModel.prototype = {

app/code/Magento/Backend/view/adminhtml/templates/system/variable/js.phtml

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<script type="text/javascript">
+<script>
 //<![CDATA[
 
 function toggleValueElement(element) {

app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml

@@ -16,7 +16,7 @@ $items = $this->getItems();
         <?php echo $this->getChildHtml($_item->getId()) ?>
     <?php endforeach ?>
     </dl>
-    <script type="text/javascript">
+    <script>
         require([
             'mage/adminhtml/accordion'
         ], function(){

app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -40,7 +40,7 @@ $_helper = $this->helper('Magento\Core\Helper\Data');
     <?php endif; ?>
 </div>
 
-<script type="text/javascript">
+<script>
 require(['jquery'], function($){
         $('.actions-split')
             .on('click.splitDefault', '.action-default', function() {

app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml

@@ -15,7 +15,7 @@
         <p class="form-buttons"><?php echo $this->getButtonsHtml('footer') ?></p>
     </div>
 <?php endif; ?>
-<script type="text/javascript">
+<script>
 require([
     'jquery',
     'mage/backend/form',

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml

@@ -58,7 +58,7 @@
     <span class="form_row">
       <label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
         <script type="text/javascript" src="<?php echo $this->getViewFileUrl('tiny_mce/tiny_mce.js') ?>"></script>
-        <script type="text/javascript">
+        <script>
 
         //<![CDATA[
         tinyMCE.init({
@@ -102,7 +102,7 @@
       <?php break;
 } ?>
 <?php if ($element->getScript()): ?>
-<script type="text/javascript">
+<script>
     <?php echo $element->getScript() ?>
 </script>
 <?php endif; ?>