Skip to content

Commit 74f0acb

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32302: Create New Order
- QA updates (configure icon)
1 parent 1e32920 commit 74f0acb

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

‎app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
1111
<div class="create-order-sidebar-block" id="sidebar_data_<?php echo $block->getDataId() ?>">
1212
<div class="head">
13-
<a href="#" class="action-refresh" title="<?php echo __('Refresh') ?>" onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
13+
<a href="#" class="action-refresh" title="<?php echo $block->escapeHtml(__('Refresh')); ?>" onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
1414
<span>Refresh</span>
1515
</a>
1616
<h5 class="create-order-sidebar-label">
@@ -36,14 +36,16 @@
3636

3737
<?php if ($block->canRemoveItems()): ?>
3838
<th class="col-remove">
39-
<span class="icon icon-remove">
39+
<span title="<?php echo $block->escapeHtml(__('Remove')); ?>"
40+
class="icon icon-remove">
4041
<span><?php echo __('Remove') ?></span>
4142
</span>
4243
</th>
4344
<?php endif; ?>
4445

4546
<th class="col-add">
46-
<span class="icon icon-add">
47+
<span title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"
48+
class="icon icon-add">
4749
<span><?php echo __('Add To Order') ?></span>
4850
</span>
4951
</th>
@@ -72,7 +74,7 @@
7274
class="admin__control-checkbox"
7375
name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]"
7476
value="<?php echo $block->getDataId() ?>"
75-
title="<?php echo __('Remove') ?>" />
77+
title="<?php echo $block->escapeHtml(__('Remove')); ?>" />
7678
<label class="admin__field-label"></label>
7779
</div>
7880
</td>
@@ -81,15 +83,25 @@
8183
<td class="col-add">
8284
<div class="admin__field-option">
8385
<?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
84-
<a href="#" onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php echo $block->getProductId($_item) ?>, <?php echo $block->getItemId($_item) ?>); return false;"><img src="<?php echo $block->getViewFileUrl('images/grouped_to_order_icon.png') ?>" class="v-middle" alt="<?php echo __('Configure and Add to Order') ?>" title="<?php echo __('Configure and Add to Order') ?>" width="16" height="16"/></a>
86+
<a href="#"
87+
class="icon icon-configure"
88+
title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
89+
onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php echo $block->getProductId($_item) ?>, <?php echo $block->getItemId($_item) ?>); return false;">
90+
<span><?php echo __('Configure and Add to Order') ?></span>
91+
</a>
8592
<?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
86-
<a href="#" onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php echo $block->getProductId($_item) ?>); return false;"><img src="<?php echo $block->getViewFileUrl('images/grouped_to_order_icon.png') ?>" class="v-middle" alt="<?php echo __('Configure and Add to Order') ?>" title="<?php echo __('Configure and Add to Order') ?>" width="16" height="16"/></a>
93+
<a href="#"
94+
class="icon icon-configure"
95+
title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
96+
onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php echo $block->getProductId($_item) ?>); return false;">
97+
<span><?php echo __('Configure and Add to Order') ?></span>
98+
</a>
8799
<?php else: ?>
88100
<input type="checkbox"
89101
class="admin__control-checkbox"
90102
name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
91103
value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
92-
title="<?php echo __('Add To Order') ?>"/>
104+
title="<?php echo $block->escapeHtml(__('Add to Order')); ?>""/>
93105
<label class="admin__field-label"></label>
94106
<?php endif; ?>
95107
</div>

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create-sidebar.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
&:extend(.abs-icon all);
6969
display: inline-block;
7070
font-size: @order-create-sidebar__font-size + 0.1rem;
71+
text-decoration: none;
7172
vertical-align: middle;
7273
&:after {
7374
color: @order-create-sidebar__color;
@@ -83,12 +84,23 @@
8384
content: @order-create-icon-add__content;
8485
}
8586
}
87+
&.icon-configure {
88+
&:after {
89+
content: @order-create-icon-configure__content;
90+
}
91+
&:hover {
92+
&:after {
93+
color: @order-create-icon-plus__hover__color;
94+
}
95+
}
96+
}
8697
> span {
8798
.extend__visually-hidden();
8899
}
89100
}
90101
.col-add {
91102
text-align: right;
103+
.icon-configure,
92104
.icon-add {
93105
margin-right: @order-create-sidebar__margin-m;
94106
}

‎app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@order-create-icon-refresh__hover__color: darken(@color-gray83, 10%);
1313

1414
@order-create-icon-add__content: @icon-arrow-right__content;
15+
@order-create-icon-configure__content: @icon-systems__content;
1516
@order-create-icon-remove__content: @icon-delete__content;
1617
@order-create-icon-refresh__content: @icon-refresh__content;
1718
@order-create-icon-plus__content: @icon-plus__content;

0 commit comments

Comments
 (0)