Skip to content

Commit 5c0596d

Browse files
author
Novykov Ivan
committed
Merge branch 'develop' into MDVA-24
2 parents 9e40bfd + 044de2d commit 5c0596d

File tree

29 files changed

+1176
-787
lines changed

29 files changed

+1176
-787
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php
1111
/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
1212
$element = $block->getElement();
13-
$note = $element->getNote() ? '<div class="note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
13+
$note = $element->getNote() ? '<div class="note admin__field-note" id="' . $element->getId() . '-note">' . $element->getNote() . '</div>' : '';
1414
$elementBeforeLabel = $element->getExtType() == 'checkbox admin__control-checkbox' || $element->getExtType() == 'radio admin__control-radio';
1515
$addOn = ($element->getBeforeElementHtml() || $element->getAfterElementHtml()) && !$element->getNoWrapAsAddon();
1616
$fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : '';

‎app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<div class="mass-select-wrap">
4545
<select
4646
id="<?php echo $block->getHtmlId() ?>-mass-select"
47-
class="action-select-multiselect"
47+
class="action-select-multiselect _disabled"
48+
disabled="disabled"
4849
data-menu="grid-mass-select">
4950
<optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
5051
<option disabled selected></option>
@@ -68,10 +69,14 @@
6869
</div>
6970

7071
<script>
71-
require(['jquery'], function($){
72+
require(['jquery', 'domReady!'], function($){
7273
'use strict';
73-
$('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
74+
$('#<?php echo $block->getHtmlId() ?>-mass-select')
75+
.removeClass('_disabled')
76+
.prop('disabled', false)
77+
.change(function () {
7478
var massAction = $('option:selected', this).val();
79+
this.blur();
7580
switch (massAction) {
7681
<?php if ($block->getUseSelectAll()):?>
7782
case 'selectAll':
@@ -88,7 +93,6 @@
8893
return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
8994
break;
9095
}
91-
this.blur();
9296
});
9397
});
9498
<?php if (!$block->getParentBlock()->canDisplayContainer()): ?>

‎app/code/Magento/Checkout/view/frontend/web/js/view/payment.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ define(
1515
'Magento_Checkout/js/model/payment-service',
1616
'Magento_Checkout/js/model/payment/method-converter',
1717
'Magento_Checkout/js/action/get-payment-information',
18-
'Magento_Checkout/js/model/checkout-data-resolver'
18+
'Magento_Checkout/js/model/checkout-data-resolver',
19+
'mage/translate'
1920
],
2021
function (
2122
$,
@@ -27,7 +28,8 @@ define(
2728
paymentService,
2829
methodConverter,
2930
getPaymentInformation,
30-
checkoutDataResolver
31+
checkoutDataResolver,
32+
$t
3133
) {
3234
'use strict';
3335

@@ -51,7 +53,7 @@ define(
5153
stepNavigator.registerStep(
5254
'payment',
5355
null,
54-
'Review & Payments',
56+
$t('Review & Payments'),
5557
this.isVisible,
5658
_.bind(this.navigate, this),
5759
20

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ define(
8383
stepNavigator.registerStep(
8484
'shipping',
8585
'',
86-
'Shipping',
86+
$t('Shipping'),
8787
this.visible, _.bind(this.navigate, this),
8888
10
8989
);

‎app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
); ?>
1818
</p>
1919
<h3 class="page-sub-sub-title"><?php /* @escapeNotVerified */ echo __('Featured Platinum Partners'); ?></h3>
20-
<div data-role="partners-block">
20+
<div data-role="partners-block" class="partners-block">
2121
<div data-role="spinner" class="admin__data-grid-loading-mask" data-bind="visible: loading">
2222
<div class="spinner">
2323
<span></span><span></span><span></span><span></span>

‎app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,26 @@
1111
$partners = $block->getPartners();
1212
?>
1313
<?php if ($partners) : ?>
14-
<div class="row row-gutter">
15-
<?php foreach ($block->getPartners() as $partner) : ?>
16-
<div class="col-m-4">
17-
<img
18-
class="partner-image"
19-
src="<?php echo $block->escapeHtml($partner['img']);?>"
20-
alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
21-
<h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
22-
<p class="partner-description">
23-
<?php echo $block->escapeHtml($partner['description']);?>
24-
<br />
25-
<a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
26-
<?php /* @escapeNotVerified */ echo __('Read More'); ?>
27-
</a>
28-
<br />
29-
<a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
30-
<?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
31-
</a>
32-
</p>
33-
</div>
34-
<?php endforeach; ?>
35-
</div>
14+
<?php foreach ($block->getPartners() as $partner) : ?>
15+
<div class="partner">
16+
<img
17+
class="partner-image"
18+
src="<?php echo $block->escapeHtml($partner['img']);?>"
19+
alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
20+
<h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
21+
<p class="partner-description">
22+
<?php echo $block->escapeHtml($partner['description']);?>
23+
<br />
24+
<a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
25+
<?php /* @escapeNotVerified */ echo __('Read More'); ?>
26+
</a>
27+
<br />
28+
<a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
29+
<?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
30+
</a>
31+
</p>
32+
</div>
33+
<?php endforeach; ?>
3634
<?php else : ?>
3735
<p>
3836
<?php /* @escapeNotVerified */ echo __('No partners were found'); ?>

‎app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ protected function _prepareForm()
7575
$fieldset->addField(
7676
'order_statuses',
7777
'multiselect',
78-
['name' => 'order_statuses', 'values' => $values, 'display' => 'none'],
78+
[
79+
'name' => 'order_statuses',
80+
'label' => '',
81+
'values' => $values,
82+
'display' => 'none'
83+
],
7984
'show_order_statuses'
8085
);
8186

‎app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ protected function _prepareForm()
8181
$fieldset->addField(
8282
'rules_list',
8383
'multiselect',
84-
['name' => 'rules_list', 'values' => $rulesListOptions, 'display' => 'none'],
84+
[
85+
'name' => 'rules_list',
86+
'label' => '',
87+
'values' => $rulesListOptions,
88+
'display' => 'none'
89+
],
8590
'price_rule_type'
8691
);
8792

‎app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Text.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,25 @@ class Text extends AbstractSwatch
1414
* @var string
1515
*/
1616
protected $_template = 'Magento_Swatches::catalog/product/attribute/text.phtml';
17+
18+
/**
19+
* Return json config for text option JS initialization
20+
*
21+
* @return array
22+
*/
23+
public function getJsonConfig()
24+
{
25+
$values = [];
26+
foreach ($this->getOptionValues() as $value) {
27+
$values[] = $value->getData();
28+
}
29+
30+
$data = [
31+
'attributesData' => $values,
32+
'isSortable' => (int)(!$this->getReadOnly() && !$this->canManageOptionDefaultOnly()),
33+
'isReadOnly' => (int)$this->getReadOnly()
34+
];
35+
36+
return json_encode($data);
37+
}
1738
}

‎app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,28 @@ protected function createStoreValues($storeId, $optionId)
5252
return $value;
5353
}
5454

55+
/**
56+
* Return json config for visual option JS initialization
57+
*
58+
* @return array
59+
*/
60+
public function getJsonConfig()
61+
{
62+
$values = [];
63+
foreach ($this->getOptionValues() as $value) {
64+
$values[] = $value->getData();
65+
}
66+
67+
$data = [
68+
'attributesData' => $values,
69+
'uploadActionUrl' => $this->getUrl('swatches/iframe/show'),
70+
'isSortable' => (int)(!$this->getReadOnly() && !$this->canManageOptionDefaultOnly()),
71+
'isReadOnly' => (int)$this->getReadOnly()
72+
];
73+
74+
return json_encode($data);
75+
}
76+
5577
/**
5678
* Parse swatch labels for template
5779
*

‎app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
<css src="jquery/colorpicker/css/colorpicker.css"/>
1212
<link src="jquery/colorpicker/js/colorpicker.js"/>
13-
<link src="Magento_Swatches::js/TypeChanger.js"/>
1413
</head>
1514
<body>
1615
<referenceContainer name="main">

‎app/code/Magento/Swatches/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<css src="Magento_Swatches::css/swatches.css"/>
1111
<css src="jquery/colorpicker/css/colorpicker.css"/>
1212
<link src="jquery/colorpicker/js/colorpicker.js"/>
13-
<link src="Magento_Swatches::js/TypeChanger.js"/>
1413
</head>
1514
<body>
1615
<referenceContainer name="form">

‎app/code/Magento/Swatches/view/adminhtml/requirejs-config.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* Copyright © 2015 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
var config = {
7+
map: {
8+
'*': {
9+
swatchesProductAttributes: 'Magento_Swatches/js/product-attributes',
10+
swatchesTypeChange: 'Magento_Swatches/js/type-change'
11+
}
12+
}
13+
};

0 commit comments

Comments
 (0)