diff --git a/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css b/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css index 6d03193a358..e35361b4904 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css +++ b/src/Sylius/Bundle/WebBundle/Resources/assets/css/backend.css @@ -469,4 +469,47 @@ input[type="file"] { .sylius-products-table .actions { width: 170px; text-align: center; +} + +/** Order. **/ +.sylius-order-content-table .picture, +.sylius-order-content-table .quantity, +.sylius-order-content-table .unit-price, +.sylius-order-content-table .total { + width: 110px; + vertical-align: middle; +} +.sylius-order-content-table .info .name { + font-size: 16px; + text-decoration: none; + margin: 0 0 5px 0; +} +.sylius-order-content-table .info ul { + margin-bottom: 0; +} +.sylius-order-content-table .info .sku code { + background: #FCFCFC; + color: #666; +} +.sylius-order-content-table tr.taxes td, +.sylius-order-content-table tr.shipping-charges td, +.sylius-order-content-table tr.promotion-discount td { + vertical-align: middle; +} +.sylius-order-content-table tr.taxes td h5, +.sylius-order-content-table tr.shipping-charges td h5, +.sylius-order-content-table tr.promotion-discount td h5 { + margin-top: 0; +} +.sylius-order-content-table tr.taxes td p, +.sylius-order-content-table tr.taxes td ul, +.sylius-order-content-table tr.shipping-charges td p, +.sylius-order-content-table tr.shipping-charges td ul, +.sylius-order-content-table tr.promotion-discount td p, +.sylius-order-content-table tr.promotion-discount td ul { + margin-bottom: 0; +} +.sylius-order-content-table span.amount { + min-width: 65px; + display: inline-block; } \ No newline at end of file diff --git a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf index 770563e5385..5a64e3c3cdc 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf +++ b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.xlf @@ -1036,7 +1036,7 @@ sylius.order.show_header - Order details + Order #%number% sylius.order.state.checkout @@ -2206,6 +2206,10 @@ sylius.product.contain_variants Contain Variants + + sylius.order.payment + Payment + diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig index 6e34a867eea..cb716af5a06 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig +++ b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Macros/misc.html.twig @@ -22,7 +22,7 @@ {% if state is sameas('completed') %} {% set class = 'label-success' %} {% elseif state in ['checkout', 'processing', 'new'] %} - {% set class = 'label-info' %} + {% set class = 'label-primary' %} {% else %} {% set class = 'label-danger' %} {% endif %} diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Order/show.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Order/show.html.twig index a89c3cd9efa..bf8fe2d4283 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Order/show.html.twig +++ b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Order/show.html.twig @@ -2,6 +2,7 @@ {% import 'SyliusWebBundle:Backend/Macros:alerts.html.twig' as alerts %} {% import 'SyliusResourceBundle:Macros:buttons.html.twig' as buttons %} +{% import 'SyliusWebBundle:Backend/Macros:misc.html.twig' as misc %} {% block topbar %}