Skip to content

Commit 98e40a9

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main/develop' into MAGETWO-50309
2 parents fb5dcfe + 0a8053d commit 98e40a9

File tree

89 files changed

+1009
-943
lines changed

Some content is hidden

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

89 files changed

+1009
-943
lines changed

‎app/code/Magento/Authorizenet/view/frontend/layout/checkout_index_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
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="checkout.root">
1111
<arguments>

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,15 @@
7272
</table>
7373
</div>
7474
</div>
75-
</div>
75+
</div>
76+
77+
<div class="messages">
78+
<div class="message message-notice notice">
79+
<span
80+
translate="'Search strings are either normal strings or regular exceptions (PCRE). They are matched in the same order as entered.'"></span>
81+
<br>
82+
<span
83+
translate="'Examples'"></span>:
84+
<span class="code-sample">Firefox: /^mozilla/i</span>
85+
</div>
86+
</div>

‎app/code/Magento/Braintree/view/frontend/layout/checkout_index_index.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
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
<referenceContainer name="after.body.start">
1111
<referenceBlock remove="true" name="braintree.paypal.component"/>
@@ -52,4 +52,4 @@
5252
</arguments>
5353
</referenceBlock>
5454
</body>
55-
</page>
55+
</page>

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -586,19 +586,10 @@ protected function customizeAdvancedPricing()
586586
'componentType' => Modal::NAME,
587587
'dataScope' => '',
588588
'provider' => 'product_form.product_form_data_source',
589-
'onCancel' => 'actionCancel',
589+
'onCancel' => 'actionDone',
590590
'options' => [
591591
'title' => __('Advanced Pricing'),
592592
'buttons' => [
593-
[
594-
'text' => __('Cancel'),
595-
'actions' => [
596-
[
597-
'targetName' => '${ $.name }',
598-
'actionName' => 'actionCancel'
599-
]
600-
]
601-
],
602593
[
603594
'text' => __('Done'),
604595
'class' => 'action-primary',

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,10 @@ protected function getOptionsGridConfig($sortOrder)
388388
],
389389
],
390390
'children' => [
391+
static::FIELD_SORT_ORDER_NAME => $this->getPositionFieldConfig(40),
391392
static::CONTAINER_COMMON_NAME => $this->getCommonContainerConfig(10),
392393
static::CONTAINER_TYPE_STATIC_NAME => $this->getStaticTypeContainerConfig(20),
393-
static::GRID_TYPE_SELECT_NAME => $this->getSelectTypeGridConfig(30),
394-
static::FIELD_SORT_ORDER_NAME => $this->getPositionFieldConfig(40)
394+
static::GRID_TYPE_SELECT_NAME => $this->getSelectTypeGridConfig(30)
395395
]
396396
],
397397
]

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ $formName = $block->getFormName();
120120
</script>
121121

122122
<script data-role="img-dialog-container-tmpl" type="text/x-magento-template">
123-
<div class="image-panel ui-tabs-panel ui-widget-content ui-corner-bottom" data-role="dialog">
123+
<div class="image-panel" data-role="dialog">
124124
</div>
125125
</script>
126126

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define([
2121
var self = this;
2222

2323
this.modal = $('<div id="create_new_attribute"/>').modal({
24-
title: $.mage.__('New Attribute'),
24+
title: $.mage.__('New Attribute'),
2525
type: 'slide',
2626
buttons: [],
2727
opened: function () {
@@ -32,7 +32,7 @@ define([
3232
});
3333
self.modal.append(self.iframe);
3434
self._changeIframeSize();
35-
$(window).off().on('resize', _.debounce(self._changeIframeSize.bind(self), 400));
35+
$(window).off().on('resize.modal', _.debounce(self._changeIframeSize.bind(self), 400));
3636
},
3737
closed: function () {
3838
var doc = self.iframe.get(0).document;
@@ -43,6 +43,7 @@ define([
4343
self.iframe.remove();
4444
}
4545
self.modal.data('modal').modal.remove();
46+
$(window).off('resize.modal');
4647
}
4748
});
4849
},

‎app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-import-custom-options.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
*/
55

66
define([
7-
'Magento_Ui/js/dynamic-rows/dynamic-rows'
8-
], function (dynamicRows) {
7+
'Magento_Ui/js/dynamic-rows/dynamic-rows',
8+
'mageUtils'
9+
], function (DynamicRows, utils) {
910
'use strict';
1011

11-
return dynamicRows.extend({
12+
return DynamicRows.extend({
1213
defaults: {
1314
dataProvider: '',
1415
insertData: [],
@@ -44,10 +45,15 @@ define([
4445

4546
data.each(function (options) {
4647
options.options.each(function (option) {
47-
var path = this.dataScope + '.' + this.index + '.' + this.recordIterator;
48+
var path = this.dataScope + '.' + this.index + '.' + this.recordIterator,
49+
curOption = utils.copy(option);
4850

49-
this.source.set(path, option);
50-
this.addChild(option, false);
51+
if (curOption.hasOwnProperty('sort_order')) {
52+
delete curOption['sort_order'];
53+
}
54+
55+
this.source.set(path, curOption);
56+
this.addChild(curOption, false);
5157
}, this);
5258
}, this);
5359
},

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,11 @@
1111
<item name="config" xsi:type="array">
1212
<item name="dataScope" xsi:type="string">data.product</item>
1313
<item name="provider" xsi:type="string">product_form.product_form_data_source</item>
14-
<item name="onCancel" xsi:type="string">actionCancel</item>
14+
<item name="onCancel" xsi:type="string">actionDone</item>
1515
<item name="options" xsi:type="array">
1616
<item name="title" xsi:type="string">Advanced Inventory</item>
1717
<item name="buttons" xsi:type="array">
1818
<item name="0" xsi:type="array">
19-
<item name="text" xsi:type="string">Cancel</item>
20-
<item name="actions" xsi:type="array">
21-
<item name="0" xsi:type="array">
22-
<item name="targetName" xsi:type="string">${ $.name }</item>
23-
<item name="actionName" xsi:type="string">actionCancel</item>
24-
</item>
25-
</item>
26-
</item>
27-
<item name="1" xsi:type="array">
2819
<item name="text" xsi:type="string">Done</item>
2920
<item name="class" xsi:type="string">action-primary</item>
3021
<item name="actions" xsi:type="array">

0 commit comments

Comments
 (0)