Skip to content

Commit 11899c6

Browse files
mahesh-singh-rajawatmahesh-singh-rajawat
committed
Merge branch '2.4-develop' into BUG#AC-700
2 parents 2de365e + 82b7dba commit 11899c6

File tree

219 files changed

+23082
-20102
lines changed

Some content is hidden

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

219 files changed

+23082
-20102
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ define([
6969
}
7070
});
7171

72-
$(document).ready(function () {
72+
$(function () {
7373
$('#system_messages .message-system-short .error').on('click', function () {
7474
$('#message-system-all').systemMessageDialog('openModal', 1);
7575
});

‎app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ define([
4444
fieldToCheck = this.options.fieldToCheck || 'success';
4545

4646
element.removeClass('success').addClass('fail');
47-
$.each($.parseJSON(this.options.fieldMapping), function (key, el) {
47+
$.each(JSON.parse(this.options.fieldMapping), function (key, el) {
4848
params[key] = $('#' + el).val();
4949
});
5050
$.ajax({

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ protected function _getValue(DataObject $row)
9797
}
9898
return '';
9999
}
100-
return $row->getData($this->getColumn()->getIndex());
100+
return $this->getColumn()->getIndex() !== null
101+
? $row->getData($this->getColumn()->getIndex())
102+
: null;
101103
}
102104

103105
/**

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ protected function _getCurrencyCode($row)
102102
if ($code = $this->getColumn()->getCurrencyCode()) {
103103
return $code;
104104
}
105-
if ($code = $row->getData($this->getColumn()->getCurrency())) {
105+
$currency = $this->getColumn()->getCurrency();
106+
107+
if ($currency !== null && $code = $row->getData($currency)) {
106108
return $code;
107109
}
108110

@@ -118,11 +120,14 @@ protected function _getCurrencyCode($row)
118120
protected function _getRate($row)
119121
{
120122
if ($rate = $this->getColumn()->getRate()) {
121-
return (float)$rate;
123+
return (float) $rate;
122124
}
123-
if ($rate = $row->getData($this->getColumn()->getRateField())) {
124-
return (float)$rate;
125+
$rateField = $this->getColumn()->getRateField();
126+
127+
if ($rateField !== null && $rate = $row->getData($rateField)) {
128+
return (float) $rate;
125129
}
130+
126131
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
127132
}
128133

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
6060
return $data;
6161
}
6262

63-
$data = (float)$data * $this->_getRate($row);
63+
$data = (float) $data * $this->_getRate($row);
6464
$data = sprintf("%f", $data);
6565
$data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
6666
return $data;
@@ -79,7 +79,9 @@ protected function _getCurrencyCode($row)
7979
if ($code = $this->getColumn()->getCurrencyCode()) {
8080
return $code;
8181
}
82-
if ($code = $row->getData($this->getColumn()->getCurrency())) {
82+
$currency = $this->getColumn()->getCurrency();
83+
84+
if ($currency !== null && $code = $row->getData($currency)) {
8385
return $code;
8486
}
8587
return false;
@@ -94,10 +96,12 @@ protected function _getCurrencyCode($row)
9496
protected function _getRate($row)
9597
{
9698
if ($rate = $this->getColumn()->getRate()) {
97-
return (float)$rate;
99+
return (float) $rate;
98100
}
99-
if ($rate = $row->getData($this->getColumn()->getRateField())) {
100-
return (float)$rate;
101+
$rateField = $this->getColumn()->getRateField();
102+
103+
if ($rateField !== null && $rate = $row->getData($rateField)) {
104+
return (float) $rate;
101105
}
102106
return 1;
103107
}

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if ($isField) {
4040
data-role="<?= $block->escapeHtmlAttr($id) ?>-wrapper">
4141
<div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
4242
<strong <?= /* @noEscape */ $isCollapsable ?
43-
'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
43+
'class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#' . $id . '-content"' :
4444
'class="title"'; ?>>
4545
<span><?= $block->escapeHtml($element->getLegend()) ?></span>
4646
</strong>

‎app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<div class="fieldset-wrapper admin__collapsible-block-wrapper opened"
1414
id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
1515
<div class="fieldset-wrapper-title">
16-
<strong class="admin__collapsible-title" data-toggle="collapse"
17-
data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
16+
<strong class="admin__collapsible-title" data-bs-toggle="collapse"
17+
data-bs-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
1818
<span><%- data.default_title %></span>
1919
</strong>
2020
<div class="actions">

‎app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ public function getAliases()
5959
public function apply()
6060
{
6161
$this->dataSetup->startSetup();
62+
$setup = $this->dataSetup;
63+
$connection = $setup->getConnection();
6264

63-
$connection = $this->dataSetup->getConnection();
64-
$attributeTable = $connection->getTableName('eav_attribute');
65+
$attributeTable = $setup->getTable('eav_attribute');
6566
/** @var EavSetup $eavSetup */
6667
$eavSetup = $this->eavSetupFactory->create(['setup' => $this->dataSetup]);
6768
$entityTypeId = $eavSetup->getEntityTypeId(Product::ENTITY);
@@ -74,8 +75,8 @@ public function apply()
7475
->where('frontend_input = ?', 'multiselect')
7576
);
7677

77-
$varcharTable = $connection->getTableName('catalog_product_entity_varchar');
78-
$textTable = $connection->getTableName('catalog_product_entity_text');
78+
$varcharTable = $setup->getTable('catalog_product_entity_varchar');
79+
$textTable = $setup->getTable('catalog_product_entity_text');
7980
$varcharTableDataSql = $connection
8081
->select()
8182
->from($varcharTable)

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="manage-titles-wrapper">
1111
<div class="fieldset-wrapper-title">
12-
<strong class="admin__collapsible-title" data-toggle="collapse" data-target="#manage-titles-content">
12+
<strong class="admin__collapsible-title" data-bs-toggle="collapse" data-bs-target="#manage-titles-content">
1313
<span><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
1414
</strong>
1515
</div>

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<div class="fieldset-wrapper-title">
1717
<strong
1818
class="admin__collapsible-title"
19-
data-toggle="collapse"
20-
data-target="#<%- data.id %>-content">
19+
data-bs-toggle="collapse"
20+
data-bs-target="#<%- data.id %>-content">
2121
<span id="option_<%- data.id %>_header_title"><%- data.title %></span>
2222
</strong>
2323
<div class="actions">

0 commit comments

Comments
 (0)