Skip to content

Commit 763cd71

Browse files
katmoonkatmoon
authored
Merge pull request #119 from magento-commerce/1.1.30-release
1.1.30 Release
2 parents 6ad1838 + df45af1 commit 763cd71

Some content is hidden

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

41 files changed

+3877
-21
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/quality-patches",
33
"description": "Provides quality patches for AdobeCommerce & Magento OpenSource",
44
"type": "magento2-component",
5-
"version": "1.1.29",
5+
"version": "1.1.30",
66
"license": "proprietary",
77
"repositories": {
88
"repo": {

‎patches-info.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎patches/commerce/ACSD-50276_2.4.5-p1.patch‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
diff --git a/vendor/magento/module-custom-attribute-management/Block/Form/Renderer/Multiselect.php b/vendor/magento/module-custom-attribute-management/Block/Form/Renderer/Multiselect.php
2+
index 634b99d3a21..e6804db1345 100644
3+
--- a/vendor/magento/module-custom-attribute-management/Block/Form/Renderer/Multiselect.php
4+
+++ b/vendor/magento/module-custom-attribute-management/Block/Form/Renderer/Multiselect.php
5+
@@ -49,7 +49,7 @@ class Multiselect extends \Magento\CustomAttributeManagement\Block\Form\Renderer
6+
public function getValues()
7+
{
8+
$value = $this->getValue();
9+
- if (!is_array($value)) {
10+
+ if ($value && !is_array($value)) {
11+
$value = explode(',', $value);
12+
}
13+
return $value;
14+
@@ -63,6 +63,6 @@ class Multiselect extends \Magento\CustomAttributeManagement\Block\Form\Renderer
15+
*/
16+
public function isValueSelected($value)
17+
{
18+
- return in_array($value, $this->getValues());
19+
+ return ($values = $this->getValues() && is_array($value)) ? in_array($value, $values) : false;
20+
}
21+
}
22+
diff --git a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/form/renderer/multiselect.phtml b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/form/renderer/multiselect.phtml
23+
index 9e4264510a2..705803ae8b4 100644
24+
--- a/vendor/magento/module-customer-custom-attributes/view/frontend/templates/form/renderer/multiselect.phtml
25+
+++ b/vendor/magento/module-customer-custom-attributes/view/frontend/templates/form/renderer/multiselect.phtml
26+
@@ -15,17 +15,22 @@ $fieldCssClass = 'field field-' . $block->getHtmlId();
27+
$fieldCssClass .= $block->isRequired() ? ' required' : '';
28+
?>
29+
<div class="<?= /* @noEscape */ $fieldCssClass ?>">
30+
- <label class="label" for="<?= $block->getHtmlId() ?>"><span><?= $block->escapeHtml($block->getLabel()) ?></span></label>
31+
+ <label class="label" for="<?= $block->getHtmlId() ?>">
32+
+ <span><?= $block->escapeHtml($block->getLabel()) ?></span></label>
33+
<div class="control">
34+
- <select multiple="multiple" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('')) ?>"<?php if ($block->getHtmlClass()) :
35+
- ?> class="select <?= $block->getHtmlClass() ?>"<?php endif;?>>
36+
- <?php foreach ($block->getOptions() as $option) :?>
37+
- <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?php if ($block->isValueSelected($option['value'])) :
38+
- ?> selected="selected"<?php endif;?>><?= $block->escapeHtml($option['label']) ?></option>
39+
- <?php endforeach;?>
40+
+ <select multiple="multiple" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
41+
+ name="<?= $block->escapeHtmlAttr($block->getFieldName('')) ?>"<?php if ($block->getHtmlClass()):
42+
+ ?> class="select <?= $block->getHtmlClass() ?>"<?php endif;?>>
43+
+ <?php foreach ($block->getOptions() as $option):?>
44+
+ <?php if ($block->escapeHtmlAttr($option['value'] !== '')): ?>
45+
+ <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"
46+
+ <?php if ($block->isValueSelected($option['value'])):
47+
+ ?> selected="selected"<?php endif;?>><?= $block->escapeHtml($option['label']) ?></option>
48+
+ <?php endif; ?>
49+
+ <?php endforeach;?>
50+
</select>
51+
- <?php if ($_message = $block->getAdditionalDescription()) : ?>
52+
- <div class="note"><?= /* @noEscape */ $_message ?></div>
53+
+ <?php if ($_message = $block->getAdditionalDescription()): ?>
54+
+ <div class="note"><?= /* @noEscape */ $_message ?></div>
55+
<?php endif; ?>
56+
</div>
57+
</div>

‎patches/commerce/ACSD-50527_1.7.2-p1.patch‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/vendor/magento/module-banner-page-builder/Model/ResourceModel/DynamicBlock/Content.php b/vendor/magento/module-banner-page-builder/Model/ResourceModel/DynamicBlock/Content.php
2+
index 4e36e5bd..f3ad5321 100644
3+
--- a/vendor/magento/module-banner-page-builder/Model/ResourceModel/DynamicBlock/Content.php
4+
+++ b/vendor/magento/module-banner-page-builder/Model/ResourceModel/DynamicBlock/Content.php
5+
@@ -29,6 +29,7 @@ public function __construct(
6+
7+
/**
8+
* Retrieves the content of the block regardless of current store view or customer segment
9+
+ *
10+
* @param int $blockId
11+
* @return string
12+
*/
13+
@@ -42,6 +43,10 @@ public function getById(int $blockId): string
14+
'banner_id=?',
15+
$blockId
16+
);
17+
- return $connection->fetchOne($select) ?? '';
18+
+ $fetch = $connection->fetchOne($select);
19+
+ if (!is_string($fetch)) {
20+
+ $fetch = '';
21+
+ }
22+
+ return $fetch;
23+
}
24+
}
25+
diff --git a/vendor/magento/module-banner-page-builder/Model/Stage/Renderer/DynamicBlock.php b/vendor/magento/module-banner-page-builder/Model/Stage/Renderer/DynamicBlock.php
26+
index 69520e62..cd677840 100644
27+
--- a/vendor/magento/module-banner-page-builder/Model/Stage/Renderer/DynamicBlock.php
28+
+++ b/vendor/magento/module-banner-page-builder/Model/Stage/Renderer/DynamicBlock.php
29+
@@ -108,7 +108,7 @@ public function render(array $params): array
30+
$params['directive'] = $content;
31+
$directiveResult = $this->widgetDirectiveRenderer->render($params);
32+
$result['content'] = $this->placeholderFilter->addPlaceholders(
33+
- $this->htmlFilter->filterHtml($directiveResult['content'])
34+
+ $this->htmlFilter->filterHtml($directiveResult['content'] ?? '')
35+
);
36+
} else {
37+
$result['error'] = __('Dynamic Block disabled');

‎patches/os/ACSD-46683_2.4.3-p2.patch‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
diff --git a/vendor/magento/module-checkout/i18n/en_US.csv b/vendor/magento/module-checkout/i18n/en_US.csv
2+
index ca118f21f24..e78b0f5c6ad 100644
3+
--- a/vendor/magento/module-checkout/i18n/en_US.csv
4+
+++ b/vendor/magento/module-checkout/i18n/en_US.csv
5+
@@ -176,6 +176,7 @@ Summary,Summary
6+
"We'll send your order confirmation here.","We'll send your order confirmation here."
7+
Payment,Payment
8+
"Not yet calculated","Not yet calculated"
9+
+"Selected shipping method is not available. Please select another shipping method for this order.","Selected shipping method is not available. Please select another shipping method for this order."
10+
"The order was not successful!","The order was not successful!"
11+
"Thank you for your purchase!","Thank you for your purchase!"
12+
"Password", "Password"
13+
diff --git a/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml b/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
14+
index e854863a1da..1bb3eb2130c 100644
15+
--- a/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
16+
+++ b/vendor/magento/module-checkout/view/frontend/layout/checkout_index_index.xml
17+
@@ -372,7 +372,7 @@
18+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
19+
<item name="config" xsi:type="array">
20+
<item name="title" xsi:type="string" translate="true">Shipping</item>
21+
- <item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
22+
+ <item name="notCalculatedMessage" xsi:type="string" translate="true">Selected shipping method is not available. Please select another shipping method for this order.</item>
23+
</item>
24+
</item>
25+
<item name="grand-total" xsi:type="array">
26+
diff --git a/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
27+
index 3394e8a4b50..41eca2db2fc 100644
28+
--- a/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
29+
+++ b/vendor/magento/theme-frontend-blank/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
30+
@@ -70,6 +70,7 @@
31+
32+
.not-calculated {
33+
font-style: italic;
34+
+ white-space: normal;
35+
}
36+
37+
//
38+
@@ -82,15 +83,7 @@
39+
border-bottom: @border-width__base solid @border-color__base;
40+
.lib-css(padding, @indent__s @indent__xl @indent__s 0);
41+
cursor: pointer;
42+
- .lib-icon-font(
43+
- @icon-down,
44+
- @_icon-font-size: 30px,
45+
- @_icon-font-line-height: 12px,
46+
- @_icon-font-text-hide: true,
47+
- @_icon-font-margin: 3px 0 0,
48+
- @_icon-font-position: after,
49+
- @_icon-font-display: block
50+
- );
51+
+ .lib-icon-font(@icon-down, @_icon-font-size: 30px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
52+
margin-bottom: 0;
53+
position: relative;
54+
55+
@@ -109,10 +102,7 @@
56+
57+
&.active {
58+
> .title {
59+
- .lib-icon-font-symbol(
60+
- @_icon-font-content: @icon-up,
61+
- @_icon-font-position: after
62+
- );
63+
+ .lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
64+
}
65+
}
66+
67+
diff --git a/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
68+
index 920e68994c6..6ae6a23b9b0 100644
69+
--- a/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
70+
+++ b/vendor/magento/theme-frontend-luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
71+
@@ -70,6 +70,7 @@
72+
73+
.not-calculated {
74+
font-style: italic;
75+
+ white-space: normal;
76+
}
77+
78+
//
79+
@@ -82,15 +83,7 @@
80+
border-bottom: @border-width__base solid @border-color__base;
81+
.lib-css(padding, @indent__s @indent__xl @indent__s 0);
82+
cursor: pointer;
83+
- .lib-icon-font(
84+
- @icon-down,
85+
- @_icon-font-size: 12px,
86+
- @_icon-font-line-height: 12px,
87+
- @_icon-font-text-hide: true,
88+
- @_icon-font-margin: 3px 0 0,
89+
- @_icon-font-position: after,
90+
- @_icon-font-display: block
91+
- );
92+
+ .lib-icon-font(@icon-down, @_icon-font-size: 12px, @_icon-font-line-height: 12px, @_icon-font-text-hide: true, @_icon-font-margin: 3px 0 0, @_icon-font-position: after, @_icon-font-display: block);
93+
margin-bottom: 0;
94+
position: relative;
95+
96+
@@ -109,10 +102,7 @@
97+
98+
&.active {
99+
> .title {
100+
- .lib-icon-font-symbol(
101+
- @_icon-font-content: @icon-up,
102+
- @_icon-font-position: after
103+
- );
104+
+ .lib-icon-font-symbol(@_icon-font-content: @icon-up, @_icon-font-position: after);
105+
}
106+
}
107+

‎patches/os/ACSD-48419_1.2.3-p2.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/vendor/magento/module-inventory-catalog/Model/ResourceModel/AddStockDataToCollection.php b/vendor/magento/module-inventory-catalog/Model/ResourceModel/AddStockDataToCollection.php
2+
index cf2ca38b238..5ec2d12a2e6 100644
3+
--- a/vendor/magento/module-inventory-catalog/Model/ResourceModel/AddStockDataToCollection.php
4+
+++ b/vendor/magento/module-inventory-catalog/Model/ResourceModel/AddStockDataToCollection.php
5+
@@ -55,7 +55,7 @@ class AddStockDataToCollection
6+
$isSalableColumnName = 'stock_status';
7+
$resource = $collection->getResource();
8+
$collection->getSelect()
9+
- ->join(
10+
+ ->{$isFilterInStock ? 'join' : 'joinLeft'}(
11+
['stock_status_index' => $resource->getTable('cataloginventory_stock_status')],
12+
sprintf('%s.entity_id = stock_status_index.product_id', Collection::MAIN_TABLE_ALIAS),
13+
[IndexStructure::IS_SALABLE => $isSalableColumnName]

0 commit comments

Comments
 (0)