Skip to content

Commit da05192

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32302: Create New Order
- QA updates (popups)
1 parent 6b8697b commit da05192

File tree

4 files changed

+30
-7
lines changed
  • app

4 files changed

+30
-7
lines changed

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
<?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
1414
<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
1515
<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
16-
<fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
16+
<fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset product-options">
1717
<legend class="legend admin__legend"><span><?php echo __('Associated Products') ?></span></legend>
18-
<div class="product-options">
19-
<div class="field admin__field _required required">
18+
<div class="field admin__field _required required">
2019
<?php foreach ($_attributes as $_attribute): ?>
2120
<label class="label admin__field-label"><?php echo $_attribute->getLabel() ?></label>
2221
<div class="control admin__field-control <?php if ($_attribute->getDecoratedIsLast()):?> last<?php endif; ?>">
@@ -27,7 +26,6 @@
2726
</select>
2827
</div>
2928
<?php endforeach; ?>
30-
</div>
3129
</div>
3230
</fieldset>
3331
<script>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
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 $block->escapeHtml(__('Refresh')); ?>" onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
14-
<span>Refresh</span>
13+
<a href="#" class="action-refresh"
14+
title="<?php echo $block->escapeHtml(__('Refresh')); ?>"
15+
onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
16+
<span><?php echo __('Refresh'); ?></span>
1517
</a>
1618
<h5 class="create-order-sidebar-label">
1719
<?php echo $block->getHeaderText() ?>
@@ -101,7 +103,7 @@
101103
class="admin__control-checkbox"
102104
name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
103105
value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
104-
title="<?php echo $block->escapeHtml(__('Add To Order')); ?>""/>
106+
title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"/>
105107
<label class="admin__field-label"></label>
106108
<?php endif; ?>
107109
</div>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,18 @@
289289
}
290290
}
291291

292+
//
293+
// Order Errors
294+
// ---------------------------------------------
295+
296+
.order-errors {
297+
.col-qty {
298+
.admin__control-text {
299+
&:extend(.abs-control-qty all);
300+
}
301+
}
302+
}
303+
292304
//
293305
// Gift options
294306
// ---------------------------------------------

app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,17 @@
317317
}
318318
}
319319

320+
.ui-dialog {
321+
.admin__fieldset {
322+
> .admin__legend {
323+
float: none;
324+
font-size: 1.8rem;
325+
margin: 0 0 2rem 34%;
326+
width: auto;
327+
}
328+
}
329+
}
330+
320331
.ui-widget-overlay {
321332
background: @popup-overlay__background-color;
322333
bottom: 0;

0 commit comments

Comments
 (0)