Skip to content

Commit 951694c

Browse files
author
Onischenko, Yaroslav(yonischenko)
committed
Merge pull request #549 from magento-webdev/PR-webdev
 [WebDev] Bugfixes
2 parents 1aa5f73 + 5ee72e1 commit 951694c

File tree

86 files changed

+652
-244
lines changed

Some content is hidden

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

86 files changed

+652
-244
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
8282
$actionCaption = '';
8383
$this->_transformActionData($action, $actionCaption, $row);
8484

85-
$htmlAttibutes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
86-
$actionAttributes->setData($htmlAttibutes);
85+
$htmlAttributes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
86+
$actionAttributes->setData($htmlAttributes);
8787
return '<option ' . $actionAttributes->serialize() . '>' . $actionCaption . '</option>';
8888
}
8989

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<?php else: ?>
2626
<?php echo $block->getHintHtml() ?>
2727
<?php endif; ?>
28-
<div class="tree-store-scope">
28+
<div class="admin__fieldset tree-store-scope">
2929
<?php if ($_element->getComment()): ?>
3030
<p class="comment"><?php echo $block->escapeHtml($_element->getComment()) ?></p>
3131
<?php endif; ?>

‎app/code/Magento/Braintree/view/frontend/web/template/payment/form.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,26 +105,24 @@
105105
</div>
106106
<!-- /ko -->
107107
<!-- ko if: (isVaultEnabled())-->
108-
<div class="field">
108+
<div class="field choice">
109109
<input type="checkbox"
110110
name="vault[is_enabled]"
111-
class="checkbox-inline"
111+
class="checkbox"
112112
data-bind="attr: {'id': getCode() + '_vault_enabler'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
113113
<label class="label" data-bind="attr: {'for': getCode() + '_vault_enabler'}">
114114
<span><!-- ko i18n: 'Save for later use.'--><!-- /ko --></span>
115115
</label>
116-
<div class="control _with-tooltip">
117-
<div class="field-tooltip toggle">
116+
<div class="field-tooltip toggle">
118117
<span class="field-tooltip-action action-vault"
119118
tabindex="0"
120119
data-toggle="dropdown"
121120
data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
122121
<span translate="'What is this?'"></span>
123122
</span>
124-
<div class="field-tooltip-content"
125-
data-target="dropdown"
126-
translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
127-
</div>
123+
<div class="field-tooltip-content"
124+
data-target="dropdown"
125+
translate="'We store you payment information securely on Braintree servers via SSL.'"></div>
128126
</div>
129127
</div>
130128
<!-- /ko -->

‎app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ protected function getBundleSelections()
578578
'parentSelections' => 'bundle_selections',
579579
'changer' => 'option_info.type',
580580
'dataType' => Form\Element\DataType\Boolean::NAME,
581-
'label' => __('Default'),
581+
'label' => __('Is Default'),
582582
'dataScope' => 'is_default',
583583
'prefer' => 'radio',
584584
'value' => '0',

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,9 @@ protected function getTierPriceStructure($tierPricePath)
493493
'label' => __('Price'),
494494
'enableLabel' => true,
495495
'dataScope' => 'price',
496+
'addbefore' => $this->locator->getStore()
497+
->getBaseCurrency()
498+
->getCurrencySymbol(),
496499
],
497500
],
498501
],

‎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
@@ -238,8 +238,8 @@ protected function createCustomOptionsPanel()
238238
],
239239
],
240240
'children' => [
241-
static::FIELD_ENABLE => $this->getEnableFieldConfig(10),
242-
static::CONTAINER_HEADER_NAME => $this->getHeaderContainerConfig(20),
241+
static::CONTAINER_HEADER_NAME => $this->getHeaderContainerConfig(10),
242+
static::FIELD_ENABLE => $this->getEnableFieldConfig(20),
243243
static::GRID_OPTIONS_NAME => $this->getOptionsGridConfig(30)
244244
]
245245
]

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88

99
?>
1010
<div class="attribute-set">
11+
12+
<div class="admin__data-grid-loading-mask"
13+
data-role="spinner">
14+
<div class="spinner">
15+
<span></span><span></span><span></span><span></span>
16+
<span></span><span></span><span></span><span></span>
17+
</div>
18+
</div>
1119
<div class="edit-attribute-set attribute-set-col">
1220
<?php echo $block->getSetFormHtml() ?>
1321
<script>
@@ -423,6 +431,7 @@
423431
jQuery(function() {
424432
initVars();
425433
TreePanels.init();
434+
jQuery("[data-role='spinner']").hide();
426435
});
427436
//]]>
428437

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -145,33 +145,24 @@
145145
<item name="sortOrder" xsi:type="number">10</item>
146146
</item>
147147
</argument>
148-
<container name="image_group">
148+
<field name="image">
149149
<argument name="data" xsi:type="array">
150-
<item name="type" xsi:type="string">group</item>
151150
<item name="config" xsi:type="array">
152-
<item name="component" xsi:type="string">Magento_Ui/js/form/components/group</item>
151+
<item name="dataType" xsi:type="string">string</item>
152+
<item name="source" xsi:type="string">category</item>
153153
<item name="label" xsi:type="string" translate="true">Category Image</item>
154+
<item name="visible" xsi:type="boolean">true</item>
155+
<item name="formElement" xsi:type="string">fileUploader</item>
156+
<item name="elementTmpl" xsi:type="string">ui/form/element/uploader/uploader</item>
157+
<item name="previewTmpl" xsi:type="string">Magento_Catalog/image-preview</item>
154158
<item name="required" xsi:type="boolean">false</item>
155159
<item name="sortOrder" xsi:type="number">40</item>
160+
<item name="uploaderConfig" xsi:type="array">
161+
<item name="url" xsi:type="url" path="catalog/category_image/upload"/>
162+
</item>
156163
</item>
157164
</argument>
158-
<field name="image">
159-
<argument name="data" xsi:type="array">
160-
<item name="config" xsi:type="array">
161-
<item name="dataType" xsi:type="string">string</item>
162-
<item name="source" xsi:type="string">category</item>
163-
<item name="label" xsi:type="string"/>
164-
<item name="visible" xsi:type="boolean">true</item>
165-
<item name="formElement" xsi:type="string">fileUploader</item>
166-
<item name="elementTmpl" xsi:type="string">ui/form/element/uploader/uploader</item>
167-
<item name="previewTmpl" xsi:type="string">Magento_Catalog/image-preview</item>
168-
<item name="uploaderConfig" xsi:type="array">
169-
<item name="url" xsi:type="url" path="catalog/category_image/upload"/>
170-
</item>
171-
</item>
172-
</argument>
173-
</field>
174-
</container>
165+
</field>
175166
<field name="description">
176167
<argument name="data" xsi:type="array">
177168
<item name="config" xsi:type="array">

‎app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</th>
102102
<?php endif; ?>
103103
<td class="cell product attribute">
104-
<div class="attibute value">
104+
<div class="attribute value">
105105
<?php switch ($_attribute->getAttributeCode()) {
106106
case "price": ?>
107107
<?php

‎app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if ($_attributeType && $_attributeType == 'text') {
3333
?>
3434

3535
<?php if ($_attributeValue): ?>
36-
<div class="product attibute <?php /* @escapeNotVerified */ echo $_className?>">
36+
<div class="product attribute <?php /* @escapeNotVerified */ echo $_className?>">
3737
<?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
3838
<div class="value" <?php /* @escapeNotVerified */ echo $_attributeAddAttribute;?>><?php /* @escapeNotVerified */ echo $_attributeValue; ?></div>
3939
</div>

0 commit comments

Comments
 (0)