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 723deab1e9f7e..c3f83e06858d8 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php @@ -124,14 +124,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/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php index 9dd312e9da801..3a1611299288c 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 @@ -175,6 +175,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/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml index aa910e6d5ade4..3b4638acb8d73 100644 --- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml +++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml @@ -8,11 +8,9 @@ - - + + - - diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php index 3d9dcd05f8fac..c055bbedbd23e 100644 --- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php +++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php @@ -8,6 +8,7 @@ use Magento\Backend\App\Action\Context; use Magento\Catalog\Model\Category; +use Magento\Customer\Model\Attribute\Data\Boolean; use Magento\Framework\Registry; class CategoriesJson extends \Magento\CatalogRule\Controller\Adminhtml\Promo\Widget @@ -32,7 +33,7 @@ public function __construct(Context $context, Registry $coreRegistry) /** * Initialize category object in registry * - * @return Category + * @return Category|Boolean */ protected function _initCategory() { diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php index ffba417eb3ac7..fac8c4d2a47f6 100644 --- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php @@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value) * * @param array $index * @param string $separator - * @return string + * @return array */ public function prepareEntityIndex($index, $separator = ' ') { diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv index 5d7d8b2bf30a4..61bc5742221a1 100644 --- a/app/code/Magento/Customer/i18n/en_US.csv +++ b/app/code/Magento/Customer/i18n/en_US.csv @@ -534,7 +534,6 @@ Addresses,Addresses "Account Dashboard","Account Dashboard" "Edit Account Information","Edit Account Information" "Password forgotten","Password forgotten" -"My Dashboard","My Dashboard" "You are signed out","You are signed out" "Associate to Website","Associate to Website" "Prefix","Prefix" diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml index 6384ee9c6562c..4494a5dd67103 100644 --- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml +++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml @@ -10,7 +10,7 @@ - My Dashboard + My Account diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php index 0da936e74ca6c..5d1fc9057fff4 100644 --- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php +++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php @@ -144,8 +144,7 @@ public function getOrderItem() * Declare qty * * @param float $qty - * @return \Magento\Sales\Model\Order\Shipment\Item - * @throws \Magento\Framework\Exception\LocalizedException + * @return $this */ public function setQty($qty) { @@ -157,7 +156,6 @@ public function setQty($qty) * Applying qty to order item * * @return $this - * @throws \Magento\Framework\Exception\LocalizedException */ public function register() { diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php index 195c0fc10dc07..38025f21cdab1 100644 --- a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php +++ b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php @@ -79,7 +79,7 @@ public function getUrlRewriteId() /** * @param int $urlRewriteId - * @return int + * @return $this */ public function setUrlRewriteId($urlRewriteId) { diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php index c1b7e6a1110f7..6d921dfdcdd65 100644 --- a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php +++ b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php @@ -72,7 +72,7 @@ public function getAdminPasswordLifetime() } /** - * Get admin maxiumum security failures from config + * Get admin maximum security failures from config * * @return int */ 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 a8778da50f70b..60287e2adba1e 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 @@ -27,6 +27,7 @@ // _____________________________________________ & when (@media-common = true) { + // Product Lists .products { margin: @indent__l 0; @@ -167,11 +168,11 @@ .column.main { .product { &-items { - margin-left: -@indent__base; + margin-left: 0; } &-item { - padding-left: @indent__base; + padding-left: 0; } } } diff --git a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less index 096b93675a92c..d81d0a8388a78 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less +++ b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less @@ -22,10 +22,6 @@ &:last-child { margin-bottom: 0; } - - &.primary { - // &:extend(.abs-button-l all); - } } &:last-child { diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php index da8f49485d634..61e42e3dd60c5 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerRedirectToDashboard.php @@ -17,7 +17,7 @@ class AssertCustomerRedirectToDashboard extends AbstractConstraint /** * Dashboard Message on account index page. */ - const DASHBOARD_MESSAGE = 'My Dashboard'; + const DASHBOARD_MESSAGE = 'My Account'; /** * Constraint severeness diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php index 02a439deb856b..22cd5bd13e94c 100644 --- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php +++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php @@ -49,7 +49,7 @@ public function run() { $this->customerAccount->open(); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); - if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Dashboard') { + if ($this->cmsIndex->getTitleBlock()->getTitle() === 'My Account') { $this->cmsIndex->getLinksBlock()->openLink('Sign Out'); $this->cmsIndex->getCmsPageBlock()->waitUntilTextIsVisible('Home Page'); $this->cmsIndex->getCmsPageBlock()->waitPageInit(); 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 2b7c416f6be16..15c90891878a0 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/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php index bd94491537efe..99c4e26b96d89 100755 --- a/lib/internal/Magento/Framework/View/Layout.php +++ b/lib/internal/Magento/Framework/View/Layout.php @@ -599,9 +599,11 @@ protected function _renderContainer($name, $useCache = true) $htmlClass = ' class="' . $htmlClass . '"'; } + $htmlAttributes = $this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_ATTRIBUTES); + $htmlTag = $this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG); - $html = sprintf('<%1$s%2$s%3$s>%4$s', $htmlTag, $htmlId, $htmlClass, $html); + $html = sprintf('<%1$s%2$s%3$s%4$s>%5$s', $htmlTag, $htmlId, $htmlClass, $htmlAttributes, $html); return $html; } diff --git a/lib/internal/Magento/Framework/View/Layout/Element.php b/lib/internal/Magento/Framework/View/Layout/Element.php index 203af4bf1553c..b97c2d4c5040d 100644 --- a/lib/internal/Magento/Framework/View/Layout/Element.php +++ b/lib/internal/Magento/Framework/View/Layout/Element.php @@ -54,6 +54,8 @@ class Element extends \Magento\Framework\Simplexml\Element const CONTAINER_OPT_HTML_ID = 'htmlId'; + const CONTAINER_OPT_HTML_ATTRIBUTES = 'htmlAttributes'; + const CONTAINER_OPT_LABEL = 'label'; /**#@-*/ diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php index 850b340e985e1..1853a355613d0 100755 --- a/lib/internal/Magento/Framework/View/Layout/Reader/Container.php +++ b/lib/internal/Magento/Framework/View/Layout/Reader/Container.php @@ -25,6 +25,7 @@ class Container implements Layout\ReaderInterface const CONTAINER_OPT_HTML_TAG = 'htmlTag'; const CONTAINER_OPT_HTML_CLASS = 'htmlClass'; const CONTAINER_OPT_HTML_ID = 'htmlId'; + const CONTAINER_OPT_HTML_ATTRIBUTES = 'htmlAttributes'; const CONTAINER_OPT_LABEL = 'label'; const CONTAINER_OPT_DISPLAY = 'display'; /**#@-*/ @@ -113,11 +114,12 @@ protected function mergeContainerAttributes( } } else { $elementData['attributes'] = [ - self::CONTAINER_OPT_HTML_TAG => (string)$currentElement[self::CONTAINER_OPT_HTML_TAG], - self::CONTAINER_OPT_HTML_ID => (string)$currentElement[self::CONTAINER_OPT_HTML_ID], - self::CONTAINER_OPT_HTML_CLASS => (string)$currentElement[self::CONTAINER_OPT_HTML_CLASS], - self::CONTAINER_OPT_LABEL => (string)$currentElement[self::CONTAINER_OPT_LABEL], - self::CONTAINER_OPT_DISPLAY => (string)$currentElement[self::CONTAINER_OPT_DISPLAY], + self::CONTAINER_OPT_HTML_TAG => (string)$currentElement[self::CONTAINER_OPT_HTML_TAG], + self::CONTAINER_OPT_HTML_ID => (string)$currentElement[self::CONTAINER_OPT_HTML_ID], + self::CONTAINER_OPT_HTML_CLASS => (string)$currentElement[self::CONTAINER_OPT_HTML_CLASS], + self::CONTAINER_OPT_HTML_ATTRIBUTES => (string)$currentElement[self::CONTAINER_OPT_HTML_ATTRIBUTES], + self::CONTAINER_OPT_LABEL => (string)$currentElement[self::CONTAINER_OPT_LABEL], + self::CONTAINER_OPT_DISPLAY => (string)$currentElement[self::CONTAINER_OPT_DISPLAY], ]; } $scheduledStructure->setStructureElementData($containerName, $elementData); diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd index 39cdec05a65ea..1a41dcb917106 100755 --- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd @@ -116,6 +116,12 @@ + + + + + + @@ -165,6 +171,7 @@ + @@ -329,6 +336,7 @@ + diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php index e4834accbcc07..4841d20951121 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php @@ -144,18 +144,20 @@ public function processDataProvider() ], 'referenceContainer' => [ 'elementCurrent' => $this->getElement( - '', + '', 'referenceContainer' ), 'containerName' => 'reference', 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => 'span', - Container::CONTAINER_OPT_HTML_ID => 'id_add', - Container::CONTAINER_OPT_HTML_CLASS => 'new', - Container::CONTAINER_OPT_LABEL => 'Add', - Container::CONTAINER_OPT_DISPLAY => null, + Container::CONTAINER_OPT_HTML_TAG => 'span', + Container::CONTAINER_OPT_HTML_ID => 'id_add', + Container::CONTAINER_OPT_HTML_CLASS => 'new', + Container::CONTAINER_OPT_HTML_ATTRIBUTES => 'attribute', + Container::CONTAINER_OPT_LABEL => 'Add', + Container::CONTAINER_OPT_DISPLAY => null, ], ], 'getStructureCondition' => $this->once(), @@ -171,11 +173,12 @@ public function processDataProvider() 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => null, - Container::CONTAINER_OPT_HTML_ID => null, - Container::CONTAINER_OPT_HTML_CLASS => null, - Container::CONTAINER_OPT_LABEL => null, - Container::CONTAINER_OPT_DISPLAY => null, + Container::CONTAINER_OPT_HTML_TAG => null, + Container::CONTAINER_OPT_HTML_ID => null, + Container::CONTAINER_OPT_HTML_CLASS => null, + Container::CONTAINER_OPT_HTML_ATTRIBUTES => null, + Container::CONTAINER_OPT_LABEL => null, + Container::CONTAINER_OPT_DISPLAY => null, ], ], 'getStructureCondition' => $this->once(), @@ -208,19 +211,20 @@ public function processDataProvider() ], 'referenceContainerDisplayFalse' => [ 'elementCurrent' => $this->getElement( - '', + '', 'referenceContainer' ), 'containerName' => 'reference', 'structureElement' => [], 'expectedData' => [ 'attributes' => [ - Container::CONTAINER_OPT_HTML_TAG => 'span', - Container::CONTAINER_OPT_HTML_ID => 'id_add', - Container::CONTAINER_OPT_HTML_CLASS => 'new', - Container::CONTAINER_OPT_LABEL => 'Add', - Container::CONTAINER_OPT_DISPLAY => 'true', + Container::CONTAINER_OPT_HTML_TAG => 'span', + Container::CONTAINER_OPT_HTML_ID => 'id_add', + Container::CONTAINER_OPT_HTML_CLASS => 'new', + Container::CONTAINER_OPT_HTML_ATTRIBUTES => 'attribute', + Container::CONTAINER_OPT_LABEL => 'Add', + Container::CONTAINER_OPT_DISPLAY => 'true', ], ], 'getStructureCondition' => $this->once(), diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less index 679c4b11fbaac..a92093b742902 100644 --- a/lib/web/css/source/lib/_buttons.less +++ b/lib/web/css/source/lib/_buttons.less @@ -276,6 +276,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, @@ -299,6 +302,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;