diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index ab45d25451850..3d9575dfaa8a0 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -120,14 +120,17 @@ protected function _toHtml()
if (!$this->_depends) {
return '';
}
- return '';
+
+ $dependsJson = $this->_getDependsJson();
+ $configOptions = $this->_configOptions ? $this->_jsonEncoder->encode($this->_configOptions) : null;
+ $configOptionsStr = $configOptions ? ', ' . $configOptions : '';
+ $paramsStr = $dependsJson . $configOptionsStr;
+
+ return "";
}
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index a9db629f24a87..82c30af830728 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -70,10 +70,7 @@ public function __construct(
$this->_storeManager = $storeManager;
$this->_currencyLocator = $currencyLocator;
$this->_localeCurrency = $localeCurrency;
- $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
- \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- 'default'
- );
+ $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
$this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
}
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index 6ee54b3e4ba30..5216aaf925f88 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -169,6 +169,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
if (!empty($updateData)) {
$updateData += ['entity_id' => $productId];
+ $updateData += ['row_id' => $productId];
$updateFields = [];
foreach ($updateData as $key => $value) {
$updateFields[$key] = $key;
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
index 9a544ff13009f..20bdcb63f55c3 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -11,6 +11,8 @@
/**
* Class ReturnProcessor
+ *
+ * @api
*/
class ReturnProcessor
{
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index ce04887732f6d..bb852d6402deb 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -156,7 +156,7 @@ protected function getImageData($product)
: 'Magento_Catalog/product/image_with_borders';
try {
- $imagesize = $helper->getResizedImageInfo();
+ $imagesize = [$helper->getWidth(), $helper->getHeight()];
} catch (NotLoadInfoImageException $exception) {
$imagesize = [$helper->getWidth(), $helper->getHeight()];
}
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
index 86df8d870552b..85c65bd0ff2d7 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
@@ -35,7 +35,11 @@
.action {
&.showcart {
&:before {
- .lib-css(color, @primary__color);
+ .lib-css(color, @button__color);
+ }
+
+ &:hover:before {
+ .lib-css(color, @button__hover__color);
}
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 7acb082bdff65..11d179846f34e 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -156,11 +156,11 @@
.column.main {
.product {
&-items {
- margin-left: -@indent__base;
+ margin-left: 0;
}
&-item {
- padding-left: @indent__base;
+ padding-left: 0;
}
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index 20cdf2b16b9e4..be0c533fb9467 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -61,12 +61,13 @@ public function testProductUpdate()
$this->_processor->getIndexer()->isScheduled(),
'Indexer is in scheduled mode when turned to update on save mode'
);
- $this->_processor->reindexAll();
$this->_product->load(1);
$this->_product->setName('Updated Product');
$this->_product->save();
+ $this->_processor->reindexAll();
+
$category = $categoryFactory->create()->load(9);
$layer = $listProduct->getLayer();
$layer->setCurrentCategory($category);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
index a889235ea1862..4c892904b3c3e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -3,6 +3,9 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
require 'order.php';
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,10 @@
$order->setIsInProcess(true);
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+ $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less
index 804302fcb69ac..a3e50a0fd24bc 100644
--- a/lib/web/css/source/lib/_buttons.less
+++ b/lib/web/css/source/lib/_buttons.less
@@ -277,6 +277,9 @@
// ---------------------------------------------
.lib-button-primary(
+ @_button-font-family: @button-primary__font-family,
+ @_button-font-size: @button-primary__font-size,
+ @_button-font-weight: @button-primary__font-weight,
@_button-line-height: @button-primary__line-height,
@_button-width: @button-primary__width,
@_button-margin: @button-primary__margin,
@@ -300,6 +303,9 @@
@_button-gradient-direction: @button-primary__gradient-direction
) {
.lib-button(
+ @_button-font-family: @_button-font-family,
+ @_button-font-size: @_button-font-size,
+ @_button-font-weight: @_button-font-weight,
@_button-line-height: @_button-line-height,
@_button-width: @_button-width,
@_button-margin: @_button-margin,
diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
index 800054e58c3dd..b1c7a49da4a7a 100644
--- a/lib/web/css/source/lib/_forms.less
+++ b/lib/web/css/source/lib/_forms.less
@@ -465,11 +465,9 @@
.lib-css(margin, @_margin);
.lib-css(padding, @_padding);
letter-spacing: -.31em;
- //word-spacing: -.43em;
> * {
letter-spacing: normal;
- //word-spacing: normal;
}
> .legend {
diff --git a/lib/web/css/source/lib/variables/_buttons.less b/lib/web/css/source/lib/variables/_buttons.less
index 82f618faa1d0f..8c31c16143859 100644
--- a/lib/web/css/source/lib/variables/_buttons.less
+++ b/lib/web/css/source/lib/variables/_buttons.less
@@ -47,6 +47,9 @@
@button__active__gradient-color-end: false;
// Primary button
+@button-primary__font-family: @button__font-family;
+@button-primary__font-size: @button__font-size;
+@button-primary__font-weight: @button__font-weight;
@button-primary__line-height: false;
@button-primary__width: false;
@button-primary__margin: false;