Skip to content

Commit db6ccbc

Browse files
committed
MAGETWO-32302: Create New Order
1 parent f19118e commit db6ccbc

File tree

3 files changed

+50
-4
lines changed

3 files changed

+50
-4
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
<input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
2121
<?php echo $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
2222
<?php if ($block->getCouponCode()): ?>
23-
<p><strong><?php echo $block->escapeHtml($block->getCouponCode()) ?></strong> [<a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo __('Remove Coupon Code') ?>"><?php echo __('Remove') ?></a>]</p>
23+
<p class="added-coupon-code">
24+
<span><?php echo $block->escapeHtml($block->getCouponCode()) ?></span>
25+
<a href="#" onclick="order.applyCoupon(''); return false;" title="<?php echo __('Remove Coupon Code') ?>"
26+
class="action-remove"><span><?php echo __('Remove') ?></span></a>
27+
</p>
2428
<?php endif; ?>
2529
<script>
2630
require(["Magento_Sales/order/create/form"], function(){

app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ require(['prototype'], function(){
9595
<input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
9696
</div>
9797
<?php endif; ?>
98-
<div style="display:none;" id="shipping-method-overlay" class="overlay"><span><?php echo __('You don\'t need to select a shipping method.') ?></span></div>
98+
<div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
99+
<span><?php echo __('You don\'t need to select a shipping method.') ?></span>
100+
</div>
99101
<script>
100102
require(["Magento_Sales/order/create/form"], function(){
101103

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

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@
225225
vertical-align: top;
226226

227227
.admin__field-control {
228-
padding-right: 35px;
228+
padding-right: 32px;
229229
position: relative;
230230
}
231231

232232
.action-default {
233233
&:extend(.abs-action-reset all);
234-
bottom: 7px;
234+
top: 7px;
235235
position: absolute;
236236
right: 0;
237237
> span {
@@ -247,6 +247,24 @@
247247
color: @page-order-icon-plus__hover__color;
248248
}
249249
}
250+
p {
251+
margin: @indent__s 0 0;
252+
}
253+
}
254+
.action-remove {
255+
color: @color-brownie;
256+
margin-left: @indent__xs;
257+
&:hover {
258+
color: @color-very-dark-gray-black2;
259+
text-decoration: none;
260+
}
261+
> span {
262+
.extend__visually-hidden();
263+
}
264+
&:before {
265+
&:extend(.abs-icon all);
266+
content: @page-order-icon-remove__content;
267+
}
250268
}
251269
}
252270

@@ -383,6 +401,28 @@
383401
padding-top: @field-option__padding-top;
384402
}
385403

404+
.order-shipping-method,
405+
.order-billing-method {
406+
position: relative;
407+
}
408+
409+
.order-methods-overlay {
410+
background: rgba(255, 255, 255, .5);
411+
bottom: 0;
412+
left: 0;
413+
position: absolute;
414+
right: 0;
415+
top: 0;
416+
span {
417+
background: @color-white;
418+
display: block;
419+
font-weight: @font-weight__bold;
420+
left: 0;
421+
position: absolute;
422+
top: 48px;
423+
}
424+
}
425+
386426
//
387427
// Gift options
388428
// ---------------------------------------------

0 commit comments

Comments
 (0)