Skip to content

Commit 72239c5

Browse files
zanileezanilee
committed
MAGETWO-32302: Create New Order
1 parent 13c1c74 commit 72239c5

File tree

5 files changed

+298
-286
lines changed

5 files changed

+298
-286
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
// _____________________________________________
99

1010
@import 'module/_order-create.less';
11+
@import 'module/_order-create-sidebar.less';
12+
@import 'module/_order-create-table.less';

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

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Variables
8+
// ---------------------------------------------
9+
10+
@page-order-sidebar__font-size: 1.5rem;
11+
@page-order-sidebar__font-size-xs: 1.1rem;
12+
@page-order-sidebar__color: @color-very-dark-gray;
13+
@page-order-sidebar__margin: 2.4rem;
14+
@page-order-sidebar__padding: @indent__base;
15+
@page-order-sidebar__margin-small: .5rem;
16+
@page-order-sidebar__margin-m: 1rem;
17+
@page-order-sidebar__margin-reqular: 1.7rem;
18+
@page-order-sidebar__border-color: @border__color;
19+
20+
@page-order-sidebar-scroll__height: 24rem;
21+
22+
//
23+
24+
//
25+
// Order Sidebar
26+
// ---------------------------------------------
27+
28+
.order-sidebar {
29+
&:extend(.admin__page-nav);
30+
color: @page-order-sidebar__color;
31+
padding: 3rem @page-order-sidebar__padding;
32+
33+
.order-currency {
34+
float: none;
35+
font-size: @font-size__base;
36+
margin: 0 0 @page-order-sidebar__margin;
37+
.admin__field-label {
38+
display: block;
39+
text-align: left;
40+
}
41+
}
42+
.customer-activity-title {
43+
border-bottom: 1px solid @page-order-sidebar__border-color;
44+
font-size: 1.9rem;
45+
font-weight: @font-weight__bold;
46+
margin: 0 0 @page-order-sidebar__margin;
47+
padding: 0 0 @page-order-sidebar__margin;
48+
}
49+
.admin__control-select {
50+
margin: 0 0 @page-order-sidebar__margin-small;
51+
width: 100%;
52+
}
53+
.order-sidebar-block {
54+
border-bottom: 1px solid @page-order-sidebar__border-color;
55+
margin: 0 0 @page-order-sidebar__margin;
56+
padding: 0 0 @page-order-sidebar__margin;
57+
}
58+
.table-info {
59+
color: @page-order-sidebar__color;
60+
width: 100%;
61+
th,
62+
td {
63+
&:first-child {
64+
padding-left: @page-order-sidebar__padding;
65+
}
66+
}
67+
.icon {
68+
&:extend(.abs-icon all);
69+
display: inline-block;
70+
font-size: @page-order-sidebar__font-size + 0.1rem;
71+
vertical-align: middle;
72+
&:after {
73+
color: @page-order-sidebar__color;
74+
}
75+
&.icon-remove {
76+
margin-left: -3px;
77+
&:after {
78+
content: @page-order-icon-remove__content;
79+
}
80+
}
81+
&.icon-add {
82+
&:after {
83+
content: @page-order-icon-add__content;
84+
}
85+
}
86+
> span {
87+
.extend__visually-hidden();
88+
}
89+
}
90+
.col-add {
91+
text-align: right;
92+
.icon-add {
93+
margin-right: @page-order-sidebar__margin-m;
94+
}
95+
}
96+
}
97+
.action-refresh {
98+
&:extend(.abs-icon all);
99+
display: table-cell;
100+
font-size: @page-order-icon-refresh__font-size;
101+
padding-right: @page-order-sidebar__margin-m;
102+
vertical-align: middle;
103+
&:after {
104+
color: @page-order-icon-refresh__color;
105+
content: @page-order-icon-refresh__content;
106+
}
107+
&:hover {
108+
&:after {
109+
color: @page-order-icon-refresh__hover__color;
110+
}
111+
text-decoration: none;
112+
}
113+
> span {
114+
.extend__visually-hidden();
115+
}
116+
}
117+
.create-order-sidebar-block {
118+
.head {
119+
margin: 0 0 @page-order-sidebar__margin;
120+
}
121+
.auto-scroll {
122+
margin: 0 -@page-order-sidebar__padding @page-order-sidebar__margin-small;
123+
max-height: @page-order-sidebar-scroll__height;
124+
overflow: auto;
125+
position: relative;
126+
+ .action-default {
127+
margin-top: @page-order-sidebar__margin-reqular;
128+
}
129+
.no-items {
130+
padding-left: @page-order-sidebar__padding;
131+
}
132+
}
133+
.admin__field-option {
134+
padding-top: 0;
135+
}
136+
}
137+
.create-order-sidebar-label {
138+
display: table-cell;
139+
font-size: @page-order-sidebar__font-size;
140+
font-weight: @font-weight__regular;
141+
margin: 0;
142+
vertical-align: middle;
143+
+ .admin__control-select {
144+
margin-top: @page-order-sidebar__margin-reqular;
145+
}
146+
}
147+
.actions {
148+
.action-secondary {
149+
width: 100%;
150+
}
151+
}
152+
}

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

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Variables
8+
// ---------------------------------------------
9+
10+
@page-order-table__border-color: @table-td__border-color;
11+
12+
//
13+
14+
//
15+
// Table
16+
// ---------------------------------------------
17+
18+
.order-tables {
19+
margin: 0 0 @page-order-sidebar__margin-reqular;
20+
width: 100%;
21+
th {
22+
border-top: 0;
23+
font-size: 1.3rem;
24+
}
25+
td {
26+
border-bottom: none;
27+
padding-top: @page-order-sidebar__padding;
28+
}
29+
tbody {
30+
tr {
31+
&:last-child {
32+
td {
33+
border-bottom: 1px solid @page-order-table__border-color;
34+
}
35+
}
36+
&.border {
37+
td {
38+
padding-top: 0;
39+
}
40+
}
41+
}
42+
}
43+
.col-qty {
44+
.admin__control-text {
45+
&:extend(.abs-control-qty all);
46+
}
47+
}
48+
.col-actions {
49+
.admin__control-select {
50+
width: 13rem;
51+
}
52+
}
53+
.price {
54+
display: inline-block;
55+
margin: 0 0 @page-order-sidebar__margin-small;
56+
}
57+
.custom-price-block {
58+
font-size: @page-order-sidebar__font-size-xs;
59+
margin: 0 0 @page-order-sidebar__margin-small;
60+
+ .admin__control-text {
61+
&:extend(.abs-control-price);
62+
}
63+
}
64+
.discount-price-block {
65+
font-size: @page-order-sidebar__font-size-xs;
66+
}
67+
.product-configure-block {
68+
margin: 1rem 0 0;
69+
.disabled {
70+
display: none;
71+
}
72+
}
73+
}
74+
75+
.order-search-items {
76+
.grid {
77+
.action-configure {
78+
float: right;
79+
}
80+
.col-id,
81+
.col-price,
82+
.col-in_products {
83+
width: 10rem;
84+
}
85+
}
86+
}
87+
88+
//
89+
// Add by SKU
90+
// ---------------------------------------------
91+
92+
.add-by-sku {
93+
clear: both;
94+
.admin__field-note {
95+
margin: 1rem 0;
96+
}
97+
.table-info {
98+
th {
99+
border-top: none;
100+
}
101+
th,
102+
td {
103+
&:first-child {
104+
padding-left: 0;
105+
}
106+
}
107+
}
108+
.col-actions {
109+
.action-default {
110+
&:extend(.abs-action-reset all);
111+
&:extend(.abs-icon all);
112+
display: inline-block;
113+
font-size: @page-order-sidebar__font-size + 0.1rem;
114+
padding-top: @page-order-sidebar__margin-small;
115+
vertical-align: middle;
116+
&:after {
117+
color: @page-order-sidebar__color;
118+
}
119+
> span {
120+
&:extend(.abs-visually-hidden all);
121+
}
122+
&.add {
123+
&:after {
124+
content: @page-order-icon-plus__content;
125+
}
126+
}
127+
&.delete {
128+
&:after {
129+
content: @page-order-icon-remove__content;
130+
}
131+
}
132+
&:hover {
133+
&:after {
134+
color: @page-order-icon-plus__hover__color;
135+
}
136+
}
137+
}
138+
}
139+
}

0 commit comments

Comments
 (0)