Skip to content

Commit 6b4958a

Browse files
vpelipenkovpelipenko
committed
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
2 parents 1a490f5 + 52b2e78 commit 6b4958a

File tree

1,396 files changed

+13441
-15268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,396 files changed

+13441
-15268
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?php endforeach;?>
1515
</ul>
1616
</div>
17-
<script type="text/javascript">
17+
<script>
1818
require([
1919
"jquery",
2020
"jquery/ui"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function getFormHtml()
178178
public function getFormInitScripts()
179179
{
180180
if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
181-
return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
181+
return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
182182
}
183183
return '';
184184
}
@@ -189,7 +189,7 @@ public function getFormInitScripts()
189189
public function getFormScripts()
190190
{
191191
if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
192-
return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
192+
return '<script>' . implode("\n", $this->_formScripts) . '</script>';
193193
}
194194
return '';
195195
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function _toHtml()
120120
if (!$this->_depends) {
121121
return '';
122122
}
123-
return '<script type="text/javascript">
123+
return '<script>
124124
require(["mage/adminhtml/form"], function(){
125125
new FormElementDependenceController(' .
126126
$this->_getDependsJson() .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function getHtml()
8686
' value="' .
8787
$this->_localeResolver->getLocaleCode() .
8888
'"/>';
89-
$html .= '<script type="text/javascript">
89+
$html .= '<script>
9090
require(["jquery", "mage/calendar"], function($){
9191
$("#' .
9292
$htmlId .

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function getHtml()
130130
) . '/>' . '</div></div>';
131131
$html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
132132
. $this->_localeResolver->getLocaleCode() . '"/>';
133-
$html .= '<script type="text/javascript">
133+
$html .= '<script>
134134
require(["jquery", "mage/calendar"],function($){
135135
$("#' . $htmlId . '_range").dateRange({
136136
dateFormat: "' . $format . '",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Grid widget massaction block
1212
*
13-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
13+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1414
* @method boolean getHideFormElement()
1515
* @author Magento Core Team <[email protected]>
1616
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Grid widget massaction block
1010
*
11-
* @method \Magento\Sales\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
11+
* @method \Magento\Quote\Model\Quote setHideFormElement(boolean $value) Hide Form element to prevent IE errors
1212
* @method boolean getHideFormElement()
1313
* @author Magento Core Team <[email protected]>
1414
* @deprecated support Magento 1.x grid massaction implementation

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct(
3232
*/
3333
protected function _getDeniedIframe()
3434
{
35-
return '<script type="text/javascript">parent.window.location = \''
35+
return '<script>parent.window.location = \''
3636
. $this->_helper->getHomePageUrl() . '\';</script>';
3737
}
3838

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
2828
/**
2929
* Quote model object
3030
*
31-
* @var \Magento\Sales\Model\Quote
31+
* @var \Magento\Quote\Model\Quote
3232
*/
3333
protected $_quote;
3434

@@ -59,7 +59,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
5959
/**
6060
* Sales quote repository
6161
*
62-
* @var \Magento\Sales\Model\QuoteRepository
62+
* @var \Magento\Quote\Model\QuoteRepository
6363
*/
6464
protected $quoteRepository;
6565

@@ -83,7 +83,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
8383
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
8484
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
8585
* @param CustomerRepositoryInterface $customerRepository
86-
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
86+
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
8787
* @param \Magento\Sales\Model\OrderFactory $orderFactory
8888
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
8989
* @param GroupManagementInterface $groupManagement
@@ -98,7 +98,7 @@ public function __construct(
9898
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
9999
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
100100
CustomerRepositoryInterface $customerRepository,
101-
\Magento\Sales\Model\QuoteRepository $quoteRepository,
101+
\Magento\Quote\Model\QuoteRepository $quoteRepository,
102102
\Magento\Sales\Model\OrderFactory $orderFactory,
103103
\Magento\Store\Model\StoreManagerInterface $storeManager,
104104
GroupManagementInterface $groupManagement
@@ -127,7 +127,7 @@ public function __construct(
127127
/**
128128
* Retrieve quote model object
129129
*
130-
* @return \Magento\Sales\Model\Quote
130+
* @return \Magento\Quote\Model\Quote
131131
*/
132132
public function getQuote()
133133
{

‎app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"magento/module-theme": "0.42.0-beta4",
1212
"magento/module-reports": "0.42.0-beta4",
1313
"magento/module-sales": "0.42.0-beta4",
14+
"magento/module-quote": "0.42.0-beta4",
1415
"magento/module-catalog": "0.42.0-beta4",
1516
"magento/module-user": "0.42.0-beta4",
1617
"magento/module-backup": "0.42.0-beta4",

0 commit comments

Comments
 (0)