From 46d9204da135d8b375a73e33d3aaabcce5990e67 Mon Sep 17 00:00:00 2001 From: Volodymyr klymenko Date: Fri, 27 Mar 2015 13:56:14 +0200 Subject: [PATCH 01/43] MAGETWO-35517: Optimize nginx.conf --- nginx.conf.sample | 153 ++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 87 deletions(-) diff --git a/nginx.conf.sample b/nginx.conf.sample index 2ea2b6ce58488..cab0b839ffe10 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -18,22 +18,17 @@ # } -root $MAGE_ROOT; - +root $MAGE_ROOT/pub; index index.php; autoindex off; -# disable_symlinks on; charset off; -location /setup/ { - rewrite / /setup/index.php; - - location /setup/pub/ {} +location /setup { + root $MAGE_ROOT; - location /setup/index.php { + location ~ ^/setup/index.php { fastcgi_pass fastcgi_backend; - fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include fastcgi_params; @@ -41,103 +36,87 @@ location /setup/ { } location / { - root $MAGE_ROOT/pub; - - location / { - rewrite / /index.php ; - } - - location /static/ { - - if ($MAGE_MODE = "production") { - expires max; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - expires off; + try_files $uri $uri/ /index.php?$args; +} - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } +location /pub { + alias $MAGE_ROOT/pub; +} - } +location /static/ { + if ($MAGE_MODE = "production") { + expires max; + } + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + expires +1y; if (!-f $request_filename) { rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; } } - - location /media/ { - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - expires +1y; - - if (!-f $request_filename) { - rewrite / /get.php; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - expires off; - - if (!-f $request_filename) { - rewrite / /get.php; - } - } + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + expires off; if (!-f $request_filename) { - rewrite / /get.php; + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; } } - - location /media/customer/ { - deny all; + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; } +} - location /media/downloadable/ { - deny all; +location /media/ { + try_files $uri $uri/ /get.php?$args; + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + expires +1y; + try_files $uri $uri/ /get.php?$args; } - - location ~ /media/theme_customization/.*\.xml$ { - deny all; + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + expires off; + try_files $uri $uri/ /get.php?$args; } +} - location /errors/ { - try_files $uri =404; - } +location /media/customer/ { + deny all; +} - location ~ ^/errors/.*\.(xml|phtml)$ { - deny all; - } +location /media/downloadable/ { + deny all; +} - location ~ cron\.php { - deny all; - } +location ~ /media/theme_customization/.*\.xml$ { + deny all; +} - location ~ (index|get|static|report|404|503)\.php$ { - expires -1; - fastcgi_pass fastcgi_backend; +location /errors/ { + try_files $uri =404; +} - fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; - fastcgi_param PHP_VALUE "memory_limit=256M \n max_execution_time=600"; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - fastcgi_param MAGE_MODE $MAGE_MODE; +location ~ ^/errors/.*\.(xml|phtml)$ { + deny all; +} - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - } +location ~ cron\.php { + deny all; +} + +location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + fastcgi_pass fastcgi_backend; + + fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; + fastcgi_param PHP_VALUE "memory_limit=256M \n max_execution_time=600"; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + fastcgi_param MAGE_MODE $MAGE_MODE; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; } From a86e3c7b24dc24633f84f0370c5ccdea696c4896 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 30 Mar 2015 12:36:20 +0300 Subject: [PATCH 02/43] MAGETWO-32302: Create New Order --- .../Magento_Sales/web/css/source/_module.less | 10 ++ .../web/css/source/module/_order-create.less | 92 +++++++++++++++++++ .../backend/web/css/source/forms/_fields.less | 16 ++-- .../backend/web/css/source/forms/_temp.less | 3 +- .../Magento/backend/web/css/styles-old.less | 53 ----------- 5 files changed, 112 insertions(+), 62 deletions(-) create mode 100644 app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less create mode 100644 app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less new file mode 100644 index 0000000000000..a79147c98125b --- /dev/null +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/_module.less @@ -0,0 +1,10 @@ +// /** +// * Copyright © 2015 Magento. All rights reserved. +// * See COPYING.txt for license details. +// */ + +// +// Pages +// _____________________________________________ + +@import 'module/_order-create.less'; diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less new file mode 100644 index 0000000000000..b7a4aeff7a3c5 --- /dev/null +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less @@ -0,0 +1,92 @@ +// /** +// * Copyright © 2015 Magento. All rights reserved. +// * See COPYING.txt for license details. +// */ + +// +// Layout +// --------------------------------------------- + +.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { + #mix-grid .row(); + .order-details { + #mix-grid .width(9,12); + float: right; + margin-left: 0; + } + .order-sidebar { + #mix-grid .column(3,12); + } + + .order-billing-address, + .order-billing-method, + .order-history { + #mix-grid .width(6,12); + float: left; + } + + .order-shipping-address, + .order-shipping-method, + .order-totals { + #mix-grid .width(6,12); + float: right; + } +} + +.order-addresses, +.order-methods, +.order-gift-options, +.order-summary { + .extend__clearfix(); +} + +// +// Table +// --------------------------------------------- + +.order-tables { + width: 100%; + th { + font-size: 1.3rem; + } +} + +// +// Totals +// --------------------------------------------- + +// ToDo UI: review the collapsible block +.summary-total { + .summary-collapse { + cursor: pointer; + display: inline-block; + &:before { + @iconsize: 16px; + content: "\e02d"; + color: #816063; + background: #f2ebde; + display: inline-block; + text-indent: 0; + font-size: @iconsize; + width:@iconsize; + height:@iconsize; + line-height: @iconsize; + overflow: hidden; + font-family: 'MUI-Icons'; + border:1px solid #ada89e; + font-style: normal; + vertical-align: top; + margin-right:7px; + font-weight: normal; + speak: none; + -webkit-font-smoothing: antialiased; + border-radius: 2px; + } + &:hover:before { + background: #cac3b4; + } + } + &.show-details .summary-collapse:before { + content: "\e03a"; + } +} diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less index 59165529f481d..160e069beabb0 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less @@ -26,7 +26,7 @@ // Form Fields // _____________________________________________ -// Fieldset +// Fieldset .admin__fieldset { border: 0; margin: 0; @@ -52,7 +52,7 @@ } } -// Label +// Label .admin__field-label { color: @field-label__color; margin: 0; @@ -107,7 +107,7 @@ } } -// Field +// Field .admin__field { margin-bottom: 0; @@ -166,7 +166,7 @@ } } -// Field error message +// Field error message .admin__field-error { background: @field-error-message__background-color; border: 1px solid @field-error-message__border-color; @@ -180,7 +180,7 @@ padding: .8rem 1rem .9rem; } -// Field notice message +// Field notice message .admin__field-note { color: @field-note__color; font-size: @field-note__font-size; @@ -188,7 +188,7 @@ padding: 0; } -// Field containing checkbox or radio +// Field containing checkbox or radio .admin__field-option { padding-top: 8px; @@ -237,7 +237,7 @@ } } -// In rows +// In rows .admin__control-fields { .admin__field-label ~ .admin__field-control { width: 100%; @@ -249,7 +249,7 @@ } } -// In line +// In line [class*='admin__control-grouped'] { box-sizing: border-box; display: table; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less index 93c09e6a81c7f..52dc94b595c2a 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less @@ -41,7 +41,8 @@ .admin__fieldset-wrapper-title { margin-bottom: 30px; padding: 14px 0 16px; - strong { + strong, + .title { &:extend(h2); } } diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less index a00d8cbb543d1..333437e66b7c9 100644 --- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less +++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less @@ -2714,11 +2714,6 @@ .style3(); } - .order-sidebar { - float: left; - width: 22%; - } - .customer-current-activity-inner { padding: 18px; } @@ -2874,54 +2869,6 @@ // Sales -> Create Order // -------------------------------------- - .summary-total { - .summary-collapse { - cursor: pointer; - display: inline-block; - &:before { - @iconsize: 16px; - content: "\e02d"; - color: #816063; - background: #f2ebde; - display: inline-block; - text-indent: 0; - font-size: @iconsize; - width:@iconsize; - height:@iconsize; - line-height: @iconsize; - overflow: hidden; - font-family: 'MUI-Icons'; - border:1px solid #ada89e; - font-style: normal; - vertical-align: top; - margin-right:7px; - font-weight: normal; - speak: none; - -webkit-font-smoothing: antialiased; - border-radius: 2px; - } - &:hover:before { - background: #cac3b4; - } - } - &.show-details .summary-collapse:before { - content: "\e03a"; - } - } - - tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) td, - tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) ~ tr.row-totals:nth-child(even) td, - tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) ~ tr.row-totals:nth-child(even) td { - background: #fbfaf6; - } - - tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) ~ tr.row-totals:nth-child(odd) td, - tr.row-totals:nth-child(even) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(even) ~ tr.row-totals:nth-child(odd) td, - tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-details):nth-child(odd) td { - background: #fff; - } - - #order-data .page-actions { padding-top: 0; } From 23a50bc9afd94daa4b5d86f4968b536e2cc9c548 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Mon, 30 Mar 2015 16:37:43 +0300 Subject: [PATCH 03/43] MAGETWO-32302: Create New Order --- .../Block/Adminhtml/Order/Create/Search.php | 2 +- .../layout/sales_order_create_index.xml | 2 + .../templates/order/address/form.phtml | 2 +- .../templates/order/create/abstract.phtml | 6 +- .../templates/order/create/coupons/form.phtml | 25 ++-- .../templates/order/create/data.phtml | 110 ++++++++++------- .../templates/order/create/form/account.phtml | 17 +-- .../templates/order/create/form/address.phtml | 89 ++++++++------ .../templates/order/create/items.phtml | 4 +- .../templates/order/create/items/grid.phtml | 6 +- .../templates/order/create/totals.phtml | 27 +++-- .../order/create/totals/default.phtml | 4 +- .../order/create/totals/grandtotal.phtml | 12 +- .../order/create/totals/shipping.phtml | 16 +-- .../order/create/totals/subtotal.phtml | 12 +- .../templates/order/create/totals/tax.phtml | 8 +- .../templates/order/giftoptions.phtml | 4 +- .../templates/order/view/giftmessage.phtml | 4 +- .../adminhtml/templates/order/view/info.phtml | 6 +- .../adminhtml/web/order/create/scripts.js | 2 +- .../view/frontend/templates/guest/form.phtml | 4 +- .../web/css/source/module/_order-create.less | 88 ++++++++++---- .../backend/web/css/source/_extends.less | 10 ++ .../backend/web/css/source/forms/_fields.less | 17 +++ .../Magento/backend/web/css/styles-old.less | 111 ------------------ 25 files changed, 299 insertions(+), 289 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php index cf3225dcb8eec..2a2961b5b1a0d 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php @@ -43,7 +43,7 @@ public function getButtonsHtml() $addButtonData = [ 'label' => __('Add Selected Product(s) to Order'), 'onclick' => 'order.productGridAddSelected()', - 'class' => 'action-add', + 'class' => 'action-add action-secondary', ]; return $this->getLayout()->createBlock( 'Magento\Backend\Block\Widget\Button' diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml index 06ed8294a5895..edb3ca36ad888 100644 --- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml +++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml @@ -12,6 +12,8 @@ + + order-header diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml index 4c678d854c911..ff4a34c8b17e1 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml @@ -14,7 +14,7 @@
- + getHeaderText() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml index a9972cc6ca086..d71847adeec0b 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml @@ -8,9 +8,9 @@ ?> -
- getHeaderText() ?> -
getButtonsHtml() ?>
+
+ getHeaderText() ?> +
getButtonsHtml() ?>
getChildHtml('', true) ?> diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml index d21c3c50f1329..5ed0a6b979192 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml @@ -13,23 +13,22 @@ * */ ?> -
-

-
-
- - getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?> - getCouponCode()): ?> -

escapeHtml($block->getCouponCode()) ?> []

- - -
-
+ +
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml index 6bd52066538ee..60a129276334e 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml @@ -13,44 +13,49 @@ order.setCurrencySymbol('getCurrencySymbol($block->getCurrentCurrencyCode()) ?>') }); - getCustomerId()): ?> -
-
- - -
-
- getChildHtml('sidebar') ?> -
-
-
- - -
getChildHtml('items') ?>
+ + + + +
+ getChildHtml('items') ?> +
+
getChildHtml('errors') ?>
- -
-
getChildHtml('billing_address') ?>
-
getChildHtml('shipping_address') ?>
+ -
-
-
- getChildHtml('billing_method') ?> +
+
+ +
+
+
+ getChildHtml('billing_address') ?> +
+
+ getChildHtml('shipping_address') ?>
-
-
+
+ +
+
+ +
+
+
+ getChildHtml('billing_method') ?> +
+
getChildHtml('shipping_method') ?>
@@ -64,20 +69,45 @@ getChildHtml('gift_options') ?> -
-
-
- - getChildHtml('comment') ?> -
+
+
+
-
-
- getChildHtml('totals') ?> -
+
+
+
+ +
+ getChildHtml('comment') ?> +
+
+
+
+ getChildHtml('totals') ?> +
+
+ + getCustomerId()): ?> +
+
+ + +
+
+ getChildHtml('sidebar') ?> +
+
+ +
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml index 255c3b83940f4..23f4f8379ceaf 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml @@ -4,15 +4,18 @@ * See COPYING.txt for license details. */ ?> -
- getHeaderText() ?> -
+ +
+ getHeaderText() ?> +
-
+ +
getForm()->getHtml() ?>
+ diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml index abab97a13d08b..3517f3fca635b 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml @@ -20,7 +20,7 @@ if ($block->getIsShipping()): order.setAddresses(getAddressCollectionJson() ?>); }); - + '; }); - + -
- getHeaderText() ?> -
- - getForm()->getHtmlIdPrefix() . 'customer_address_id' ?> -
- -

- getIsShipping()): ?> - getIsAsBilling()): ?>checked/> - - -   - -

+
+ + getHeaderText() ?> +
+ +
+ getIsShipping()): ?> +
+ getIsAsBilling()): ?>checked class="admin__control-checkbox" /> + +
+ +
+ + getForm()->getHtmlIdPrefix() . 'customer_address_id' ?> +
+ +
-
- getForm()->toHtml() ?> -
-
- getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()):?> checked="checked"/> - + getForm()->toHtml() ?> + +
+ getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked" + class="admin__control-checkbox"/> +
getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?> - + + +
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml index b7f98bb2143f0..e2b9bd096a03c 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml @@ -8,8 +8,8 @@ ?> -
- getHeaderText() ?> +
+ getHeaderText() ?>
getButtonsHtml() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml index 80cf6765da7a5..d30366ff4fba7 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml @@ -16,7 +16,7 @@ getItems() ?>
- +
@@ -44,7 +44,7 @@ getButtonHtml(__('Update Items and Qty\'s'), 'order.itemsUpdate()'); ?> -
+
@@ -137,7 +137,7 @@ -
+ getMessage(false) as $message): if (empty($message)) { continue; diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml index 1ad9afba28cf0..4349611714fa8 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml @@ -7,26 +7,33 @@ // @codingStandardsIgnoreFile ?> - - + +
+ +
renderTotals(); ?> renderTotals('footer'); ?>
-
+
-
- getNoteNotify()): ?> checked="checked"/> - +
+ getNoteNotify()): ?> checked="checked" + class="admin__control-checkbox"/> +
canSendNewOrderConfirmationEmail()): ?> -
- - +
+ +
-
getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary'); ?>
+
+ getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary'); ?> +
+ require([ + 'Magento_Sales/order/create/form' + ], function(){ + order.itemsOnchangeBind() + }); +
isGiftMessagesAvailable()) : ?> diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less index b74ebc2e62a57..7ba168e1ab233 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less @@ -14,7 +14,6 @@ @login-box__shadow: 0 5px 30px 0 rgba(0, 0, 0, 1); @login-page__background-color: @color-very-dark-grayish-orange; - // // Admin user auth pages layout // --------------------------------------------- diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less index 41eae7b281215..07512ecae1cc6 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less @@ -19,11 +19,11 @@ @page-order-icon-refresh__color: @color-gray83; @page-order-icon-refresh__hover__color: darken(@color-gray83, 10%); - @page-order-icon-add__content: @icon-arrow-right__content; @page-order-icon-remove__content: @icon-delete__content; @page-order-icon-refresh__content: @icon-refresh__content; +// // // Layout @@ -67,6 +67,51 @@ } } +// +// Order discounts +// --------------------------------------------- + +.admin__order-discounts { + .extend__clearfix(); + margin-top: @indent__base; + .action-secondary { + float: right; + margin-top: 2.8rem; + } + .order-coupons { + float: left; + } + .admin__field { + display: inline-block; + margin: 0 3.5rem 0 0; + vertical-align: top; + + .admin__field-control { + padding-right: 35px; + position: relative; + } + + .action-default { + &:extend(.abs-action-reset all); + position: absolute; + right: 0; + bottom: 7px; + span { + .extend__visually-hidden(); + } + + &:before { + &:extend(.abs-icon all); + content: @icon-arrow-right__content; + } + + &:hover { + color: @color-very-dark-gray-black2; + } + } + } +} + // // Blocks // --------------------------------------------- @@ -87,12 +132,15 @@ padding-bottom: @indent__xs; .actions { float: right; - margin-top: -@indent__xs; margin-bottom: @page-order-sidebar__margin-reqular; + margin-top: -@indent__xs; } .action-secondary { margin-left: @indent__base; } + .title { + margin: 0; + } } .admin__legend { @@ -101,13 +149,16 @@ margin-bottom: @indent__l; } -// .admin__control-fields { -// .admin__field:nth-child(n+2):not(.admin__field-option) { -// > .admin__field-label { -// .extend__visually-hidden-reset() -// } -// } -// } + .admin__field { + .extend__field-rows(); + } + + .admin__field-option { + .admin__field-label { + display: block; + width: auto; + } + } } // @@ -126,7 +177,7 @@ .label { display: block; font-size: @page-order-sidebar-base__font-size; - margin: 0 0 1rem; + margin: 0 0 @indent__s; } } .title { @@ -137,8 +188,8 @@ padding: 0 0 @page-order-sidebar__margin; } .admin__control-select { - width: 100%; margin: 0 0 @page-order-sidebar__margin-small; + width: 100%; } .order-sidebar-block { border-bottom: 1px solid @page-order-sidebar__border-color; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less index f6679928d0171..063fa918ca7e6 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less @@ -43,12 +43,12 @@ } &:not(.admin__field-option) { > .admin__field-label { - text-align: left; - width: auto; display: block; line-height: @field-label__font-size; margin-bottom: 1rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2 , 2); // Try to Calculate margin offset considering line-height; margin-top: 0rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2, 2); + text-align: left; + width: auto; &:before { display: none; } diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less index e033d4c177d4f..ae78ca94c23d1 100644 --- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less +++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less @@ -12,7 +12,7 @@ @import "../mui/styles/vars.less"; @import (reference) "../mui/styles/abstract.less"; // Import some abstract -/* DO NOT REMOVE! Can be dangerous (need for Product Creation) */ +// DO NOT REMOVE! Can be dangerous (need for Product Creation) .collapse.in, .no-js .collapse { height: auto !important; @@ -29,7 +29,7 @@ input.no-display, .invisible { visibility: hidden; } -/* DO NOT REMOVE! Can be dangerous (need for Product Creation) */ +// DO NOT REMOVE! Can be dangerous (need for Product Creation) .admin__scope-old { box-sizing: content-box; @@ -47,7 +47,7 @@ input.no-display, margin: 0 0 6px; } - /* TODO: remove after all templates refactoring */ + // TODO: remove after all templates refactoring span.required { display: none; } @@ -58,9 +58,10 @@ input.no-display, margin-left: 3px; } - /* - Control with added before and after content - -------------------------------------- */ + // + // Control with added before and after content + // --------------------------------------------- + .addon { padding: 0; display: table; @@ -127,8 +128,8 @@ input.no-display, border-width: 1px 0 1px 1px; } - /*.addon {direction: rtl; } - .addon > * {direction: ltr; }*/ +// .addon {direction: rtl; } +// .addon > * {direction: ltr; } .addon *:focus ~ .addafter { @@ -143,7 +144,7 @@ input.no-display, display: inline; } - /* Addon left aligned */ + // Addon left aligned .field-price .addon { direction: rtl; } @@ -157,17 +158,19 @@ input.no-display, border-radius: 1px 0 0 1px; } - /* - Form actions - -------------------------------------- */ + // + // Form actions + // --------------------------------------------- + .form-actions { padding: 10px; margin: 10px 0; } - /* - Default view for fields: Labels are above the controls - -------------------------------------- */ + // + // Default view for fields: Labels are above the controls + // --------------------------------------------- + .form-inline .label, .form-inline .control { margin: 0; @@ -217,10 +220,11 @@ input.no-display, font-weight: bold; } - /* - Field with multiple fields - -------------------------------------- */ - /* TODO: rename 'fields-group' class. Propose - 'group' */ + // + // Field with multiple fields + // --------------------------------------------- + + // TODO: rename 'fields-group' class. Propose - 'group' [class^="fields-group-"] .field { vertical-align: top; @@ -253,8 +257,8 @@ input.no-display, } [class^="fields-group-"] { - letter-spacing: -0.31em; /* webkit */ - word-spacing: -0.43em; /* IE < 8 && gecko */ + letter-spacing: -0.31em; // webkit + word-spacing: -0.43em; // IE < 8 && gecko } [class^="fields-group-"] > * { @@ -262,9 +266,10 @@ input.no-display, word-spacing: normal; } - /* - Form field with nested controls inside - -------------------------------------- */ + // + // Form field with nested controls inside + // --------------------------------------------- + .nested { padding: 6px 0 0; } @@ -280,10 +285,6 @@ input.no-display, padding: 0; } - .control *:first-child { - /*margin-top: 0;*/ - } - .nested .field { width: auto; padding: 0; @@ -299,9 +300,10 @@ input.no-display, margin-bottom: 0; } - /* - Clearfix - -------------------------------------- */ + // + // Clearfix + // --------------------------------------------- + .buttons-set:before, .buttons-set:after, .form-inline .field:before, @@ -6030,10 +6032,10 @@ input.no-display, } } -/* ==|== print styles ======================================================= - Print styles. - Inlined to avoid required HTTP connection: h5bp.com/r - ========================================================================== */ +// ==|== print styles ======================================================= +// Print styles. +// Inlined to avoid required HTTP connection: h5bp.com/r +// ========================================================================== @media print { * { @@ -6045,7 +6047,7 @@ input.no-display, -ms-filter: none !important; } - /* Black prints faster: h5bp.com/s */ + // Black prints faster: h5bp.com/s a, a:visited { text-decoration: underline; } @@ -6062,7 +6064,7 @@ input.no-display, content: ""; } - /* Don't show links for images, or javascript/internal links */ + // Don't show links for images, or javascript/internal links pre, blockquote { border: 1px solid #999; page-break-inside: avoid; @@ -6072,7 +6074,7 @@ input.no-display, display: table-header-group; } - /* h5bp.com/t */ + // h5bp.com/t tr, img { page-break-inside: avoid; } diff --git a/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css b/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css deleted file mode 100644 index ae88a9bc74109..0000000000000 --- a/app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php index 8f5798e80294d..cef456aeee760 100644 --- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php +++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php @@ -413,7 +413,7 @@ public function getAfterElementJs() public function getLabelHtml($idSuffix = '') { if ($this->getLabel() !== null) { - $html = '
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml index 66410b715679c..06b1e692a036a 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml @@ -15,7 +15,7 @@ getChildHtml('footer'); ?>
- +
getTotals('footer')?> diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml index 45989082696f5..a268bb8701f21 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml @@ -36,7 +36,7 @@ $orderStoreDate = $block->formatDate($_order->getCreatedAtStoreDate(), \IntlDate -
+
@@ -102,7 +102,7 @@ $orderStoreDate = $block->formatDate($_order->getCreatedAtStoreDate(), \IntlDate
getAccountEditLink()?>
-
+
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml index fe84cbc0f200d..cb1c7006dd751 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml @@ -10,7 +10,7 @@ getOrder() ?>
- +
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml index 7d5ade24045ac..701a7c73a192f 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml @@ -13,7 +13,7 @@
-
+
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less index c4b74dd93afa9..63cc3eff79092 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less @@ -11,10 +11,11 @@ // Sidebar // --------------------------------------------- -@page-order-sidebar-base__font-size: 1.5rem; +@page-order-sidebar__font-size: 1.5rem; +@page-order-sidebar__font-size-xs: 1.1rem; @page-order-sidebar__color: @color-very-dark-gray; @page-order-sidebar__margin: 2.4rem; -@page-order-sidebar__padding: 2rem; +@page-order-sidebar__padding: @indent__base; @page-order-sidebar__margin-reqular: 1.7rem; @page-order-sidebar__margin-small: .5rem; @page-order-sidebar__border-color: @border__color; @@ -29,6 +30,8 @@ @page-order-icon-plus__content: @icon-plus__content; @page-order-icon-plus__hover__color: @color-very-dark-gray-black2; +@page-order-table__border-color: @table-td__border-color; + // // @@ -61,8 +64,6 @@ } } - - // // Table // --------------------------------------------- @@ -74,19 +75,52 @@ border-top: 0; font-size: 1.3rem; } + td { + border-bottom: none; + padding-top: @page-order-sidebar__padding; + } + tbody { + tr { + &:last-child { + td { + border-bottom: 1px solid @page-order-table__border-color; + } + } + &.border { + td { + padding-top: 0; + } + } + } + } .col-qty { .admin__control-text { &:extend(.abs-control-qty all); } } + .col-actions { + .admin__control-select { + width: 13rem; + } + } .price { display: block; margin: 0 0 @page-order-sidebar__margin-small; } .custom-price-block { + font-size: @page-order-sidebar__font-size-xs; margin: 0 0 @page-order-sidebar__margin-small; - .admin__control-text { - width: auto; + + .admin__control-text { + &:extend(.abs-control-price); + } + } + .discount-price-block { + font-size: @page-order-sidebar__font-size-xs; + } + .product-configure-block { + margin: 1rem 0 0; + .disabled { + display: none; } } } @@ -135,7 +169,7 @@ &:extend(.abs-action-reset all); &:extend(.abs-icon all); display: inline-block; - font-size: @page-order-sidebar-base__font-size + 0.1rem; + font-size: @page-order-sidebar__font-size + 0.1rem; padding-top: @page-order-sidebar__margin-small; vertical-align: middle; &:after { @@ -188,9 +222,9 @@ .action-default { &:extend(.abs-action-reset all); + bottom: 7px; position: absolute; right: 0; - bottom: 7px; > span { .extend__visually-hidden(); } @@ -212,6 +246,14 @@ // --------------------------------------------- .order-details { + .order-search-items { + .col-qty { + .admin__control-text { + &:extend(.abs-control-qty); + } + } + } + .admin__fieldset-wrapper:not(:last-child) { margin-bottom: 5rem; } @@ -325,13 +367,8 @@ float: none; font-size: @font-size__base; margin: 0 0 @page-order-sidebar__margin; - .label { - display: block; - font-size: @page-order-sidebar-base__font-size; - margin: 0 0 @indent__s; - } } - .title { + .customer-activity-title { border-bottom: 1px solid @page-order-sidebar__border-color; font-size: 1.9rem; font-weight: @font-weight__bold; @@ -359,7 +396,7 @@ .icon { &:extend(.abs-icon all); display: inline-block; - font-size: @page-order-sidebar-base__font-size + 0.1rem; + font-size: @page-order-sidebar__font-size + 0.1rem; vertical-align: middle; &:after { color: @page-order-sidebar__color; @@ -411,7 +448,7 @@ } .create-order-sidebar-label { display: inline-block; - font-size: @page-order-sidebar-base__font-size; + font-size: @page-order-sidebar__font-size; font-weight: @font-weight__regular; margin: 0; + .admin__control-select { diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less index c28914054060d..bf591fe9921f7 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less @@ -16,6 +16,7 @@ @table-tfoot__background-color: @color-white-fog; +@table-info__font-size: 1.3rem; @table-info__padding-vertical: 1rem; @table-info__padding-horizontal: 1.5rem; @@ -28,6 +29,7 @@ // --------------------------------------------- .table-info { + font-size: @table-info__font-size; th, td { padding: @table-info__padding-vertical @table-info__padding-horizontal; diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less index f4a5ce3b56060..cdd580f1b5d85 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_data-grid-temp.less @@ -8,10 +8,13 @@ // --------------------------------------------- @data-grid-temp__font-size: 1.3rem; +@data-grid-temp__margin-xs: 1rem; +@data-grid-temp__margin: 2rem; +@data-grid-temp__color: @text__color; @data-grid-temp-cell__border-width: 1px; -@data-grid-temp-cell__padding-horizontal: 1rem; -@data-grid-temp-cell__padding-vertical: 1rem; +@data-grid-temp-cell__padding-horizontal: @data-grid-temp__margin-xs; +@data-grid-temp-cell__padding-vertical: @data-grid-temp__margin-xs; @data-grid-temp-td__border-color: @color-gray84; @data-grid-temp-td__border-inner-style: dashed; @@ -28,22 +31,28 @@ @data-grid-temp-th__padding-vertical: @data-grid-temp-cell__padding-vertical; @data-grid-temp-th__hover__background-color: lighten(@data-grid-temp-th__background-color, 5%); +// Pager +@data-grid-temp-pager__width: 4rem; +@data-grid-temp-pager-icon__color: @data-grid-temp-th__background-color; +@data-grid-temp-pager-icon-previous__content: @icon-caret-left__content; +@data-grid-temp-pager-icon-next__content: @icon-caret-right__content; + // -// Temporary grid styles -// -------------------------------------- +// Temporary grid styles +// --------------------------------------------- .grid { table { &:not(.data-table) { border: none; font-size: @data-grid-temp__font-size; - margin-bottom: 2rem; + margin-bottom: @data-grid-temp__margin; max-width: 100%; width: 100%; thead { background-color: transparent; - color: @text__color; + color: @data-grid-temp__color; } tr { @@ -70,6 +79,10 @@ line-height: @line-height__base; transition: background-color .3s; vertical-align: top; + &:last-child { + padding-left: @data-grid-temp__margin; + padding-right: @data-grid-temp__margin; + } } td { @@ -115,12 +128,6 @@ } } - th:last-child, - td:last-child { - padding-left: @data-grid-temp-cell__padding-horizontal * 2; - padding-right: @data-grid-temp-cell__padding-horizontal * 2; - } - // Filters from mui/table.less .filter { th { @@ -172,9 +179,9 @@ outline: 0; } &:before { - height: 29px; - margin-left: 5px; - width: 35px; + height: 2.9rem; + margin-left: .5rem; + width: 3.5rem; } } } @@ -184,12 +191,12 @@ } .not-sort { - padding-right: 1rem; + padding-right: @data-grid-temp__margin-xs; } .sort-arrow-asc, .sort-arrow-desc { - padding-right: 2rem; + padding-right: @data-grid-temp__margin; position: relative; &:after { position: absolute; @@ -230,25 +237,25 @@ } // -// Grid actions -// -------------------------------------- +// Grid actions +// --------------------------------------------- .grid-actions { &:extend(.abs-clearfix all); - margin: 0 0 2rem; + margin: 0 0 @data-grid-temp__margin; position: relative; .export, .filter-actions { float: right; - margin-left: 1rem; + margin-left: @data-grid-temp__margin-xs; vertical-align: top; } } // -// Pager -// -------------------------------------- +// Pager +// --------------------------------------------- .pager { float: left; @@ -258,11 +265,54 @@ .pages-total-found { margin-right: 2.5rem } + .pages-total { + margin: 0 @data-grid-temp__margin-xs 0 0; + } + .view-pages { .admin__control-select { - margin: 0 1rem; + margin: 0 @data-grid-temp__margin-xs; } } -} + label { + &.page { + &:extend(.abs-visually-hidden all); + } + } + .admin__control-text { + margin: 0 1rem; + min-width: 0; + text-align: center; + width: @data-grid-temp-pager__width; + } + + .action-previous { + .icon-font( + @data-grid-temp-pager-icon-previous__content, + @_icon-font: @icons-admin__font-name, + @_icon-font-color: @data-grid-temp-pager-icon__color, + @_icon-font-size: 17px, + @_icon-font-text-hide: true + ); + + } + .action-next { + .icon-font( + @data-grid-temp-pager-icon-next__content, + @_icon-font: @icons-admin__font-name, + @_icon-font-color: @data-grid-temp-pager-icon__color, + @_icon-font-size: 17px, + @_icon-font-text-hide: true + ); + } + .action-default { + margin-right: @data-grid-temp__margin-xs; + padding: .3em .9em; + vertical-align: top; + &:before { + font-weight: @font-weight__bold; + } + } +} diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less index cdfaf0ab809bf..df4d785977dbd 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less @@ -56,7 +56,7 @@ background-color: @field-control__disabled__background-color; border-color: @field-control__border-color; color: @field-control__color; - opacity: .5; + opacity: @disabled__opacity; cursor: not-allowed; } @@ -209,7 +209,7 @@ option:empty { border-color: @field-control__border-color; } color: @field-control__color; - opacity: .5; + opacity: @disabled__opacity; } } } diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less index 18a9f2538579e..e1cc4af8cd61d 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less @@ -70,5 +70,11 @@ .abs-control-qty { min-width: 0; - width: 5rem; + width: 5.4rem; } + +.abs-control-price { + min-width: 0; + width: 10rem; +} + diff --git a/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less b/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less index 13f9dbc30e0d6..fa70769896ebb 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/variables/_typography.less @@ -27,4 +27,4 @@ @link__hover__color: @color-blue-pure; // Disabled -@disabled__opacity: .7; +@disabled__opacity: .5; diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less index 02b06846f847c..f4507cd2f7908 100644 --- a/app/design/adminhtml/Magento/backend/web/mui/styles/table.less +++ b/app/design/adminhtml/Magento/backend/web/mui/styles/table.less @@ -70,6 +70,17 @@ table { // Grid table header filters and settings //-------------------------------------- +.grid-actions, +.pager, +.massaction, +.filter { + .input-text, + select, + .select { + margin: 0 10px 0 0; + } +} + // // Table Filters //-------------------------------------- @@ -102,8 +113,6 @@ table { // Table Grid //-------------------------------------- .grid { - background: @grid-frame-background-color; - .style18(); padding: 15px; table { @@ -553,13 +562,6 @@ td.col-type { } .pager { - font-size: 13px; - .pages-total-found { - margin-right: 25px; - } - .view-pages .select { - margin: 0 7px; - } .link-feed { font-size: 12px; margin: 7px 15px 0 0; @@ -567,58 +569,6 @@ td.col-type { right: 0; top: 0; } - .action-previous, - .action-next { - .button-as-link(); - line-height: .6; - overflow: hidden; - width: 20px; - &:before { - margin-left: -10px; - } - &.disabled { - opacity: .3; - } - } - .action-previous { - .icon-font( - @icon-prev, - @_icon-font-color: @pager-actions__color, - @_icon-font-color-hover: @pager-actions__color-hover, - @_icon-font-size: 40px, - @_icon-font-text-hide: true - ); - } - .action-next { - .icon-font( - @icon-next, - @_icon-font-color: @pager-actions__color, - @_icon-font-color-hover: @pager-actions__color-hover, - @_icon-font-size: 40px, - @_icon-font-text-hide: true - ); - } - .input-text { - height: 25px; - line-height: 16px; - margin-right: 5px; - text-align: center; - width: 25px; - vertical-align: top; - } - label.page { - &:extend(.visually-hidden all); - } - .pages-total { - line-height: 25px; - vertical-align: top; - } -} - -.grid .pager { - margin: 15px 0 0; - position: relative; - text-align: center; } // From 7e212829b1db64ceba89d588a3a53daf81c73fc7 Mon Sep 17 00:00:00 2001 From: Olga Matviienko Date: Fri, 3 Apr 2015 13:17:16 +0300 Subject: [PATCH 14/43] MAGETWO-32302: Create New Order - Account Information --- .../templates/order/create/abstract.phtml | 11 +++-- .../templates/order/create/data.phtml | 2 +- .../order/create/shipping/method/form.phtml | 10 ++--- .../web/css/source/module/_order-create.less | 43 ++++++++++++++----- .../backend/web/css/source/_extends.less | 11 ++++- .../web/css/source/forms/_extends.less | 5 +++ 6 files changed, 59 insertions(+), 23 deletions(-) diff --git a/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml index 7ebc48041243a..802e8c8759f97 100644 --- a/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml +++ b/app/code/Magento/Centinel/view/adminhtml/templates/order/create/abstract.phtml @@ -5,11 +5,10 @@ */ ?> -
-
- getHeaderText() ?> -
getButtonsHtml() ?>
-
- +
+ getHeaderText() ?> +
getButtonsHtml() ?>
+
+
getChildHtml('', true) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml index 475d50c2c5c10..d166ab4edac32 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml @@ -62,7 +62,7 @@
getChildBlock('card_validation')): ?> -
+
getChildHtml('card_validation') ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml index ec723a915c26a..e5edb0b4a5674 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml @@ -72,8 +72,8 @@ - + class="action-default"> +
@@ -85,12 +85,12 @@ require(['prototype'], function(){ getIsRateRequest()): ?>
- +
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less index 63cc3eff79092..4f41f1a5cfdf2 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less +++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order-create.less @@ -241,6 +241,25 @@ } } +// +// Order Account Information +// --------------------------------------------- + +.order-account-information { + .admin__fieldset { + &:extend(.abs-clearfix all); + } + .admin__field { + margin-bottom: 0; + } + .field-group_id { + float: left; + } + .field-email { + overflow: hidden; + } +} + // // Order Address Information // --------------------------------------------- @@ -281,9 +300,7 @@ } .admin__legend { - font-size: 1.8rem; - font-weight: @font-weight__semibold; - margin-bottom: @indent__l; + &:extend(.abs-fieldset-legend all); } .admin__field { @@ -298,12 +315,10 @@ } } -.admin__vat-number { +.field-vat-number { .action-default { - &:extend(.abs-action-tertiary all); - font-weight: @font-weight__regular; + &:extend(.abs-action-tertiary-as-link all); margin-top: @indent__s; - padding: 0; } } @@ -312,12 +327,17 @@ // --------------------------------------------- .order-methods { // ToDo UI: add styles for 3d secure - .admin__legend { - margin-bottom: 1.5rem; - } .admin__field { &:extend(.abs-field-rows all); } + .admin__fieldset-wrapper-content { + .admin__fieldset-wrapper-title { + &:extend(.abs-fieldset-legend all); + border-bottom: 0; + margin-bottom: 1.5rem; + padding: 0; + } + } } .admin__payment-method-wapper { @@ -352,6 +372,9 @@ .order-shipping-method-summary { padding-top: @field-option__padding-top; + .action-default { + &:extend(.abs-action-tertiary-as-link all); + } } // diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less index eb49c987e3b56..563014d75f53e 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less @@ -34,6 +34,16 @@ } } +// +// Actions +// --------------------------------------------- + +.abs-action-tertiary-as-link { + &:extend(.action-tertiary all); + font-weight: @font-weight__regular; + padding: 0; +} + // // Other // --------------------------------------------- @@ -56,7 +66,6 @@ &:extend(.abs-visually-hidden-reset all); } - // Clearfix .abs-clearfix { .clearfix(); diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less index e1cc4af8cd61d..699c2ba354eeb 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_extends.less @@ -78,3 +78,8 @@ width: 10rem; } +.abs-fieldset-legend { + font-size: 1.8rem; + font-weight: @font-weight__semibold; + margin-bottom: @indent__l; +} From 0592b734e0b88a4b494de5711eba75c983a8de45 Mon Sep 17 00:00:00 2001 From: Oleg Zinoviev Date: Fri, 3 Apr 2015 19:46:10 +0300 Subject: [PATCH 15/43] MAGETWO-32302: Create New Order - Custom options, bundle products - UI updates --- .../composite/fieldset/options/bundle.phtml | 4 +- .../fieldset/options/type/checkbox.phtml | 84 +++++++++++-------- .../fieldset/options/type/multi.phtml | 8 +- .../fieldset/options/type/radio.phtml | 27 +++--- .../fieldset/options/type/select.phtml | 16 ++-- .../Block/Product/View/Options/Type/Date.php | 2 +- .../Product/View/Options/Type/Select.php | 12 +-- .../product/composite/fieldset/options.phtml | 6 +- .../fieldset/options/type/date.phtml | 6 +- .../fieldset/options/type/default.phtml | 8 +- .../fieldset/options/type/file.phtml | 21 +++-- .../fieldset/options/type/select.phtml | 8 +- .../fieldset/options/type/text.phtml | 12 +-- .../product/composite/fieldset/qty.phtml | 12 +-- .../composite/fieldset/configurable.phtml | 14 ++-- .../web/css/source/module/_order-create.less | 2 +- .../source/components/_data-grid-temp.less | 5 -- .../backend/web/css/source/forms/_fields.less | 5 +- 18 files changed, 139 insertions(+), 113 deletions(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml index 86d170187b0af..3fa751cc55a90 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml @@ -11,8 +11,8 @@ decorateArray($block->getOptions()); ?> -
-
+
+
getSelections()) : ?> diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml index 930efcfb1c1aa..669b634c52ffb 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml @@ -11,43 +11,53 @@ getOption(); ?> getSelections(); ?> helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?> -
- -
-
- getRequired()): ?> - getSelectionQtyTitlePrice($_selections[0]) ?> - - - -
- isSelected($_selection)) { - echo ' checked="checked"' ?>isSaleable() && !$_skipSaleableCheck) { - echo ' disabled="disabled"' ?> - value="getSelectionId() ?>" - onclick="ProductConfigure.bundleControl.changeSelection(this)" - price="getSelectionPrice($_selection) ?>" /> - - getRequired()): ?> - setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?> - -
- -
- + +
+ + +
+
+ + getRequired()): ?> + getSelectionQtyTitlePrice($_selections[0]) ?> + + + + +
+ isSelected($_selection)):?> + + + isSaleable() && !$_skipSaleableCheck):?> + + + value="getSelectionId() ?>" + onclick="ProductConfigure.bundleControl.changeSelection(this)" + price="getSelectionPrice($_selection) ?>" /> + + + + getRequired()): ?> + setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?> + +
+ + +
+
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml index 03922735e0c8e..9f49261b63773 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml @@ -11,9 +11,9 @@ getOption(); ?> getSelections(); ?> helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?> -
- -
+
+ +
getRequired()): ?> getSelectionQtyTitlePrice($_selections[0]) ?> getRequired()): ?> -
+
isSalable()) ? '' : ' checked="checked" ' ?> value="" @@ -36,10 +37,11 @@ for="bundle-option-getId() ?>">
+ -
+
isSelected($_selection)) echo ' checked="checked"' ?>isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> @@ -56,12 +58,13 @@
-
-