Skip to content

Commit 2c67392

Browse files
author
Denys Rul
committed
Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191
2 parents d1f95df + 1fcc5c6 commit 2c67392

File tree

367 files changed

+4161
-1400
lines changed

Some content is hidden

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

367 files changed

+4161
-1400
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ atlassian*
3232
/pub/media/theme/*
3333
/pub/media/theme_customization/*
3434
!/pub/media/theme_customization/.htaccess
35+
/pub/media/wysiwyg/*
36+
!/pub/media/wysiwyg/.htaccess
3537
/pub/media/tmp/*
3638
!/pub/media/tmp/.htaccess
3739
/pub/static/*

‎COPYING.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
22

33
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4-
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
4+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
55

6-
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
6+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
77
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ protected function calculateDynamicBundleAmount($basePriceValue, $bundleProduct,
314314

315315
/** @var Store $store */
316316
$store = $bundleProduct->getStore();
317-
$roundingMethod = $this->taxHelper->getCalculationAgorithm($store);
317+
$roundingMethod = $this->taxHelper->getCalculationAlgorithm($store);
318318
foreach ($amountList as $amountInfo) {
319319
/** @var \Magento\Framework\Pricing\Amount\AmountInterface $itemAmount */
320320
$itemAmount = $amountInfo['amount'];

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,15 @@ protected function _prepareLayout()
7878
[
7979
'id' => 'save',
8080
'label' => __('Save Category'),
81-
'onclick' => "categorySubmit('" . $this->getSaveUrl() . "', true)",
82-
'class' => 'save primary save-category'
81+
'class' => 'save primary save-category',
82+
'data_attribute' => [
83+
'mage-init' => [
84+
'Magento_Catalog/catalog/category/edit' => [
85+
'url' => $this->getSaveUrl(),
86+
'ajax' => true
87+
]
88+
]
89+
]
8390
]
8491
);
8592
}

‎app/code/Magento/Catalog/Model/Product.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,8 +777,10 @@ public function afterSave()
777777
*/
778778
public function setQty($qty)
779779
{
780-
$this->setData('qty', $qty);
781-
$this->reloadPriceInfo();
780+
if ($this->getData('qty') != $qty) {
781+
$this->setData('qty', $qty);
782+
$this->reloadPriceInfo();
783+
}
782784
return $this;
783785
}
784786

‎app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<head>
1010
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
11-
<link src="Magento_Catalog::js/bootstrap/category-edit.js"/>
1211
</head>
1312
<update handle="editor"/>
1413
<body>

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* Create/edit some category
77
*/
88
define([
9-
"jquery",
10-
"prototype"
11-
], function(jQuery){
9+
'jquery',
10+
'prototype'
11+
], function (jQuery) {
1212

13-
var categorySubmit = function (url, useAjax) {
13+
var categorySubmit = function (url, useAjax) {
1414
var activeTab = $('active_tab_id');
1515
if (activeTab) {
1616
if (activeTab.tabsJsObject && activeTab.tabsJsObject.tabs('activeAnchor')) {
@@ -69,6 +69,10 @@ var categorySubmit = function (url, useAjax) {
6969
jQuery('#category_edit_form').trigger('submit');
7070
};
7171

72-
window.categorySubmit = categorySubmit;
73-
72+
return function (config, element) {
73+
config = config || {};
74+
jQuery(element).on('click', function (event) {
75+
categorySubmit(config.url, config.ajax);
76+
});
77+
};
7478
});

‎app/code/Magento/Catalog/view/adminhtml/web/js/bootstrap.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎app/code/Magento/Catalog/view/adminhtml/web/js/bootstrap/category-edit.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎app/code/Magento/Directory/Model/PriceCurrency.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,12 @@ public function convert($amount, $scope = null, $currency = null)
5858
}
5959

6060
/**
61-
* Convert and round price value for specified store or passed currency
62-
*
63-
* @param float $amount
64-
* @param null|string|bool|int|\Magento\Store\Model\Store $store
65-
* @param Currency|string|null $currency
66-
* @param int $precision
67-
* @return float
61+
* {@inheritdoc}
6862
*/
69-
public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
63+
public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
7064
{
71-
$currentCurrency = $this->getCurrency($store, $currency);
72-
$convertedValue = $this->getStore($store)->getBaseCurrency()->convert($amount, $currentCurrency);
65+
$currentCurrency = $this->getCurrency($scope, $currency);
66+
$convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
7367
return round($convertedValue, $precision);
7468
}
7569

0 commit comments

Comments
 (0)