Skip to content

Commit eef3304

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32302: Create New Order
- CR updates
1 parent 3d97b22 commit eef3304

File tree

11 files changed

+70
-57
lines changed

11 files changed

+70
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function _getCheckboxHtml($value, $checked)
116116
' admin__control-checkbox' .
117117
'"';
118118
$html .= $checked . $this->getDisabled() . '/>';
119-
$html .= '<label></label>';
119+
$html .= '<label class="admin__field-label"></label>';
120120
return $html;
121121
}
122122

‎app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
onclick="ProductConfigure.bundleControl.changeSelection(this)"
4646
price="<?php echo $block->getSelectionPrice($_selection) ?>" />
4747

48-
<label class="label"
48+
<label class="admin__field-label"
4949
for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
5050
<span><?php echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
5151
</label>

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ require(['prototype'], function(){
7878
<?php endif; ?>
7979
<?php endif; ?>
8080
<div class="input-box" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
81+
<!-- ToDo UI: add appropriate file class when z-index issue in ui dialog will be resolved -->
8182
<input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?>/>
8283
<input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
8384

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
1111
<?php $_option = $block->getOption(); ?>
1212
<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
13-
<label class="label admin__field-label">
13+
<label class="label admin__field-label">
1414
<span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
1515
</label>
16-
<div class="control admin__field-control">
16+
<div class="control admin__field-control">
1717
<?php echo $block->getValuesHtml() ?>
1818
<?php if ($_option->getIsRequire()): ?>
1919
<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
2020
<span id="options-<?php echo $_option->getId() ?>-container"></span>
2121
<?php endif; ?>
2222
<?php endif;?>
23-
</div>
23+
</div>
2424
</div>

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/qty.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="field admin__field">
1616
<label class="label admin__field-label"><span><?php echo __('Quantity') ?></span></label>
1717
<div class="control admin__field-control">
18-
<input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?php echo $block->getQtyValue() * 1 ?>">
18+
<input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?php echo $block->getQtyValue() * 1 ?>">
1919
</div>
2020
</div>
2121
</fieldset>

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,32 @@
6767

6868
<?php if ($block->canRemoveItems()): ?>
6969
<td class="col-remove">
70-
<input type="checkbox"
71-
class="admin__control-checkbox"
72-
name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]"
73-
value="<?php echo $block->getDataId() ?>"
74-
title="<?php echo __('Remove') ?>" />
75-
<label class="label"></label>
70+
<div class="admin__field-option">
71+
<input type="checkbox"
72+
class="admin__control-checkbox"
73+
name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]"
74+
value="<?php echo $block->getDataId() ?>"
75+
title="<?php echo __('Remove') ?>" />
76+
<label class="admin__field-label"></label>
77+
</div>
7678
</td>
7779
<?php endif; ?>
7880

7981
<td class="col-add">
80-
<?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
81-
<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>
82-
<?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
83-
<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>
84-
<?php else: ?>
85-
<input type="checkbox"
86-
class="admin__control-checkbox"
87-
name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
88-
value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
89-
title="<?php echo __('Add To Order') ?>"/>
90-
<label class="label"></label>
91-
<?php endif; ?>
82+
<div class="admin__field-option">
83+
<?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>
85+
<?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>
87+
<?php else: ?>
88+
<input type="checkbox"
89+
class="admin__control-checkbox"
90+
name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
91+
value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
92+
title="<?php echo __('Add To Order') ?>"/>
93+
<label class="admin__field-label"></label>
94+
<?php endif; ?>
95+
</div>
9296
</td>
9397
</tr>
9498
<?php endforeach; ?>

‎app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44
// */
55

66
.product-composite-configure-inner {
7-
.product-composite-qty-block {
8-
.admin__field-label {
9-
width: auto;
10-
}
11-
}
127
.admin__control-text {
138
&.qty {
14-
&:extend(.abs-control-qty);
9+
&:extend(.abs-control-qty all);
1510
}
1611
}
1712
}

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

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -170,32 +170,34 @@
170170
}
171171
}
172172
}
173-
.action-default {
174-
&:extend(.abs-action-reset all);
175-
&:extend(.abs-icon all);
176-
display: inline-block;
177-
font-size: @page-order-sidebar__font-size + 0.1rem;
178-
padding-top: @page-order-sidebar__margin-small;
179-
vertical-align: middle;
180-
&:after {
181-
color: @page-order-sidebar__color;
182-
}
183-
> span {
184-
&:extend(.abs-visually-hidden all);
185-
}
186-
&.add {
173+
.col-actions {
174+
.action-default {
175+
&:extend(.abs-action-reset all);
176+
&:extend(.abs-icon all);
177+
display: inline-block;
178+
font-size: @page-order-sidebar__font-size + 0.1rem;
179+
padding-top: @page-order-sidebar__margin-small;
180+
vertical-align: middle;
187181
&:after {
188-
content: @page-order-icon-plus__content;
182+
color: @page-order-sidebar__color;
189183
}
190-
}
191-
&.delete {
192-
&:after {
193-
content: @page-order-icon-remove__content;
184+
> span {
185+
&:extend(.abs-visually-hidden all);
194186
}
195-
}
196-
&:hover {
197-
&:after {
198-
color: @page-order-icon-plus__hover__color;
187+
&.add {
188+
&:after {
189+
content: @page-order-icon-plus__content;
190+
}
191+
}
192+
&.delete {
193+
&:after {
194+
content: @page-order-icon-remove__content;
195+
}
196+
}
197+
&:hover {
198+
&:after {
199+
color: @page-order-icon-plus__hover__color;
200+
}
199201
}
200202
}
201203
}
@@ -417,6 +419,10 @@
417419
float: none;
418420
font-size: @font-size__base;
419421
margin: 0 0 @page-order-sidebar__margin;
422+
.admin__field-label {
423+
display: block;
424+
text-align: left;
425+
}
420426
}
421427
.customer-activity-title {
422428
border-bottom: 1px solid @page-order-sidebar__border-color;
@@ -494,6 +500,10 @@
494500
margin: 0 0 @page-order-sidebar__margin-small;
495501
max-height: 17rem;
496502
overflow: auto;
503+
position: relative;
504+
}
505+
.admin__field-option {
506+
padding-top: 0;
497507
}
498508
}
499509
.create-order-sidebar-label {

‎app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
.admin__fieldset > & {
133133
margin-bottom: 3rem;
134134
position: relative;
135-
// No z-index here please (in ui dialogs then not works!)
136135
}
137136

138137
&[data-config-scope] {
@@ -223,6 +222,11 @@
223222
}
224223
}
225224

225+
// Field containing value (like price or something else)
226+
.admin__field-value {
227+
padding-top: @field-option__padding-top;
228+
}
229+
226230
//
227231
// Field containing multiple fields
228232
// _____________________________________________

‎app/design/adminhtml/Magento/backend/web/mui/styles/table.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ td.col-type {
306306
// Data table
307307
//--------------------------------------
308308
.data-table {
309-
border-collapse: separate; // do not remove this! without this rule in FF when table has only 1 row bottom and side borders disappear
310309
width: 100%;
311310
thead,
312311
tfoot,

0 commit comments

Comments
 (0)