Skip to content

Commit f0c8088

Browse files
alzotaalzota
authored
Merge pull request #9795 from magento-gl/commpr-10131-001
[Bluetooth] Community Pull Requests delivery dashprs
2 parents 147e077 + ffc9fb8 commit f0c8088

File tree

12 files changed

+45
-54
lines changed

12 files changed

+45
-54
lines changed

‎app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,8 @@ public function getUsedProductIds($product)
552552
{
553553
if (!$product->hasData($this->_usedProductIds)) {
554554
$usedProductIds = [];
555-
foreach ($this->getUsedProducts($product) as $product) {
556-
$usedProductIds[] = $product->getId();
555+
foreach ($this->getUsedProducts($product) as $childProduct) {
556+
$usedProductIds[] = $childProduct->getId();
557557
}
558558
$product->setData($this->_usedProductIds, $usedProductIds);
559559
}

‎app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\GroupedProduct\Model\Product\Type;
77

@@ -403,7 +403,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
403403
}
404404
$associatedProducts = !$isStrictProcessMode || !empty($productsInfo)
405405
? $this->getAssociatedProducts($product)
406-
: false;
406+
: [];
407407

408408
foreach ($associatedProducts as $subProduct) {
409409
$qty = $productsInfo[$subProduct->getId()];

‎app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
9-
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
109
<body>
1110
<referenceBlock name="customer_form_register">
1211
<container name="fieldset.create.info.additional" as="fieldset_create_info_additional"/>

‎app/code/Magento/Msrp/view/base/layout/cms_index_index.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2011 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="msrp_popup"/>
1010
<body/>
11-
</page>
11+
</page>

‎app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2011 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<update handle="msrp_popup"/>
1010
<body/>
1111
</page>

‎app/code/Magento/Newsletter/view/frontend/layout/customer_account_create.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2011 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceBlock name="customer_form_register">
1111
<block name="customer.form.register.newsletter" template="Magento_Newsletter::form/register/newsletter.phtml"/>

‎app/code/Magento/Sitemap/view/frontend/layout/robots_index_index.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8-
<page layout="robots" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceContainer name="root">
1111
<block class="Magento\Sitemap\Block\Robots" name="sitemapRobotsLinks"/>

‎app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -21,26 +21,14 @@
2121
*/
2222
class DeletePaymentToken implements ResolverInterface
2323
{
24-
/**
25-
* @var PaymentTokenManagementInterface
26-
*/
27-
private $paymentTokenManagement;
28-
29-
/**
30-
* @var PaymentTokenRepositoryInterface
31-
*/
32-
private $paymentTokenRepository;
33-
3424
/**
3525
* @param PaymentTokenManagementInterface $paymentTokenManagement
3626
* @param PaymentTokenRepositoryInterface $paymentTokenRepository
3727
*/
3828
public function __construct(
39-
PaymentTokenManagementInterface $paymentTokenManagement,
40-
PaymentTokenRepositoryInterface $paymentTokenRepository
29+
private readonly PaymentTokenManagementInterface $paymentTokenManagement,
30+
private readonly PaymentTokenRepositoryInterface $paymentTokenRepository
4131
) {
42-
$this->paymentTokenManagement = $paymentTokenManagement;
43-
$this->paymentTokenRepository = $paymentTokenRepository;
4432
}
4533

4634
/**

‎app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -19,18 +19,12 @@
1919
*/
2020
class PaymentTokens implements ResolverInterface
2121
{
22-
/**
23-
* @var PaymentTokenManagement
24-
*/
25-
private $paymentTokenManagement;
26-
2722
/**
2823
* @param PaymentTokenManagement $paymentTokenManagement
2924
*/
3025
public function __construct(
31-
PaymentTokenManagement $paymentTokenManagement
26+
private readonly PaymentTokenManagement $paymentTokenManagement
3227
) {
33-
$this->paymentTokenManagement = $paymentTokenManagement;
3428
}
3529

3630
/**

‎app/code/Magento/VaultGraphQl/registration.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

88
use Magento\Framework\Component\ComponentRegistrar;
99

10-
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_VaultGraphQl', __DIR__);
10+
ComponentRegistrar::register(
11+
ComponentRegistrar::MODULE,
12+
'Magento_VaultGraphQl',
13+
__DIR__
14+
);

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/_data-grid-static.less

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// /**
2-
// * Copyright © Magento, Inc. All rights reserved.
3-
// * See COPYING.txt for license details.
2+
// * Copyright 2017 Adobe
3+
// * All Rights Reserved.
44
// */
55

66
//
@@ -24,6 +24,11 @@
2424
background-color: fade(@data-grid-td__even__background-color, @data-grid-td__dragging__opacity);
2525
}
2626
}
27+
&:hover {
28+
td {
29+
background-color: @data-grid-td__even__hover__background-color;
30+
}
31+
}
2732
}
2833
}
2934

‎app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// /**
2-
// * Copyright © Magento, Inc. All rights reserved.
3-
// * See COPYING.txt for license details.
2+
// * Copyright 2017 Adobe
3+
// * All Rights Reserved.
44
// */
55

66
//
@@ -20,6 +20,7 @@
2020
@data-grid-td__border-inner-style: dashed;
2121
@data-grid-td__border-outer-style: solid;
2222
@data-grid-td__even__background-color: @color-white-smoke;
23+
@data-grid-td__even__hover__background-color: #e5f7fe;
2324
@data-grid-td__even__dragging__background-color: @color-light-gray0;
2425
@data-grid-td__even__edit__background-color: darken(@data-grid-td__even__background-color, 10%);
2526
@data-grid-td__odd__background-color: @page__background-color;

0 commit comments

Comments
 (0)