Skip to content

Commit 6cfb9b6

Browse files
internal-magento-queue-manager[bot]internal-magento-queue-manager[bot]
authored
Merge pull request #9464 from magento-gl/spartans_pr_02012025
[Spartans] BugFixes Delivery
2 parents 2a912a9 + 5a90bed commit 6cfb9b6

File tree

10 files changed

+35
-37
lines changed

10 files changed

+35
-37
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2018 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -14,7 +14,7 @@
1414
<element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
1515
<element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
1616
<element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
17-
<element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price p.price-from span.price-final_price span.price-wrapper span.price"/>
17+
<element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price span.price-final_price span.price-wrapper span.price"/>
1818
<element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
1919
<element name="productBundleOneOptionInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'option')]" parameterized="true" timeout="30"/>
2020
<element name="productBundleOptionQty" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'qty')]" parameterized="true" timeout="30"/>

‎app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2013 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
@@ -68,7 +68,7 @@
6868
</action>
6969
</referenceBlock>
7070
<referenceContainer name="content">
71-
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
71+
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/>
7272
</referenceContainer>
7373
<referenceContainer name="product.info.type">
7474
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="Magento_Bundle::catalog/product/view/type/bundle.phtml"/>

‎app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced.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\CatalogSearch\Model\ResourceModel;
77

@@ -64,7 +64,7 @@ protected function _construct()
6464
*/
6565
public function prepareCondition($attribute, $value)
6666
{
67-
$condition = $value;
67+
$condition = false;
6868

6969
if (is_array($value)) {
7070
if ($attribute->getBackendType() == 'varchar') { // multiselect

‎app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php‎

Lines changed: 7 additions & 4 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 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\CheckoutAgreements\Model;
77

@@ -96,11 +96,14 @@ protected function getAgreementsConfig()
9696
$agreementConfiguration['isEnabled'] = (bool)($isAgreementsEnabled && count($agreementsList) > 0);
9797

9898
foreach ($agreementsList as $agreement) {
99+
$isAgreementHtmlType = $agreement->getIsHtml();
99100
$agreementConfiguration['agreements'][] = [
100-
'content' => $agreement->getIsHtml()
101+
'content' => $isAgreementHtmlType
101102
? $agreement->getContent()
102103
: nl2br($this->escaper->escapeHtml($agreement->getContent())),
103-
'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
104+
'checkboxText' => $isAgreementHtmlType
105+
? $agreement->getCheckboxText()
106+
: nl2br($this->escaper->escapeHtml($agreement->getCheckboxText())),
104107
'mode' => $agreement->getMode(),
105108
'agreementId' => $agreement->getAgreementId(),
106109
'contentHeight' => $agreement->getContentHeight()

‎app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.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 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -88,7 +88,6 @@ public function testGetConfigIfContentIsHtml(): void
8888
{
8989
$content = 'content';
9090
$checkboxText = 'checkbox_text';
91-
$escapedCheckboxText = 'escaped_checkbox_text';
9291
$mode = AgreementModeOptions::MODE_AUTO;
9392
$agreementId = 100;
9493
$contentHeight = '100px';
@@ -98,7 +97,7 @@ public function testGetConfigIfContentIsHtml(): void
9897
'agreements' => [
9998
[
10099
'content' => $content,
101-
'checkboxText' => $escapedCheckboxText,
100+
'checkboxText' => $checkboxText,
102101
'mode' => $mode,
103102
'agreementId' => $agreementId,
104103
'contentHeight' => $contentHeight
@@ -122,11 +121,6 @@ public function testGetConfigIfContentIsHtml(): void
122121
->with($searchCriteriaMock)
123122
->willReturn([$agreement]);
124123

125-
$this->escaperMock->expects($this->once())
126-
->method('escapeHtml')
127-
->with($checkboxText)
128-
->willReturn($escapedCheckboxText);
129-
130124
$agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
131125
$agreement->expects($this->once())->method('getContent')->willReturn($content);
132126
$agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);

‎app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
@@ -29,7 +29,7 @@
2929
<referenceBlock name="head.components">
3030
<block class="Magento\Framework\View\Element\Js\Components" name="downloadable_page_head_components" template="Magento_Downloadable::js/components.phtml"/>
3131
</referenceBlock>
32-
<move element="product.info" destination="content" after="product.info.media" />
32+
<move element="product.info" destination="content" after="product.info.main" />
3333
<move element="product.info.social" destination="product.info.options.wrapper.bottom" after="-" />
3434
</body>
3535
</page>

‎app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php‎

Lines changed: 5 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 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -132,7 +132,9 @@ private function validateRowError(object $errorAggregator, int $totalRows): bool
132132
$errors = $errorAggregator->getAllErrors();
133133
$rowNumber = [];
134134
foreach ($errors as $error) {
135-
$rowNumber = array_unique([...$rowNumber , ...[$error->getRowNumber()]]);
135+
if ($error->getRowNumber()) {
136+
$rowNumber = array_unique([...$rowNumber , ...[$error->getRowNumber()]]);
137+
}
136138
}
137139
(count($rowNumber) < $totalRows)? $this->_validateRowError = true : $this->_validateRowError = false;
138140
return $this->_validateRowError;

‎app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php‎

Lines changed: 2 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\Sales\Model\ResourceModel\Order\Payment;
77

@@ -152,7 +152,6 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $transacti
152152
$parentId = (int)$this->_lookupByTxnId($orderId, $paymentId, $parentTxnId, $idFieldName);
153153
if ($parentId && $txnType == 'authorization') {
154154
$transaction->setData('parent_id', $parentId);
155-
$transaction->setData('txn_type', \Magento\Sales\Model\Order\Payment\Transaction::TYPE_CAPTURE);
156155
}
157156
} else {
158157
$result = $this->getParentId($orderId);

‎app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2013 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
@@ -71,7 +71,7 @@
7171
</action>
7272
</referenceBlock>
7373
<referenceContainer name="content">
74-
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
74+
<container name="bundle.options.container" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/>
7575
</referenceContainer>
7676
<referenceContainer name="product.info.type">
7777
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="Magento_Bundle::catalog/product/view/type/bundle.phtml"/>

‎app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_downloadable.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2014 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
@@ -41,7 +41,7 @@
4141
</arguments>
4242
</block>
4343
</referenceContainer>
44-
<move element="product.info" destination="content" after="product.info.media" />
44+
<move element="product.info" destination="content" after="product.info.main" />
4545
<move element="product.info.social" destination="product.info.options.wrapper.bottom" after="-" />
4646
</body>
4747
</page>

0 commit comments

Comments
 (0)