From db62094fdffa60f069adf662906761b3ef9f53e3 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Wed, 22 May 2024 15:42:16 +0200 Subject: [PATCH] [Admin][Order][Show] Minor improvements --- .../order_details/seeing_order_with_items.feature | 1 - .../items/body/discounted_unit_price.html.twig | 4 ++-- .../items/body/distributed_order_discount.html.twig | 4 ++-- .../content/sections/items/body/subtotal.html.twig | 4 ++-- .../show/content/sections/items/body/tax.html.twig | 6 +++--- .../show/content/sections/items/body/total.html.twig | 4 ++-- .../sections/items/body/unit_discount.html.twig | 4 ++-- .../content/sections/items/body/unit_price.html.twig | 4 ++-- .../order/show/content/sections/items/foot.html.twig | 4 ---- .../content/sections/items/foot/tax_total.html.twig | 4 ++-- .../show/content/sections/items/foot/total.html.twig | 4 ++-- .../order/show/content/sections/payments.html.twig | 4 ---- .../order/show/content/sections/summary.html.twig | 4 ++-- .../content/sections/summary/items_total.html.twig | 4 ++-- .../sections/summary/promotion_total.html.twig | 6 +++--- .../content/sections/summary/shipping_total.html.twig | 11 +++++------ .../show/content/sections/summary/tax_total.html.twig | 4 ++-- 17 files changed, 33 insertions(+), 43 deletions(-) diff --git a/features/admin/order/managing_orders/order_details/seeing_order_with_items.feature b/features/admin/order/managing_orders/order_details/seeing_order_with_items.feature index 5734d9186e6..3d87782ae64 100644 --- a/features/admin/order/managing_orders/order_details/seeing_order_with_items.feature +++ b/features/admin/order/managing_orders/order_details/seeing_order_with_items.feature @@ -12,7 +12,6 @@ Feature: Seeing an order with its items And the store allows paying with "Cash on Delivery" And there is a customer "lucy@teamlucifer.com" that placed an order "#00000666" And the customer bought an "Angel T-Shirt" and an "Angel Mug" - And the customer set the billing address as "Mike Ross", "350 5th Ave", "10118", "New York", "United States" And the customer chose "Free" shipping method to "United States" with "Cash on Delivery" payment And I am logged in as an administrator diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/discounted_unit_price.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/discounted_unit_price.html.twig index 5a7d7ff09f5..7ce0ee2f2f7 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/discounted_unit_price.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/discounted_unit_price.html.twig @@ -1,8 +1,8 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {% set item = hookable_metadata.context.item %} - {{ _money.format(item.fullDiscountedUnitPrice, order.currencyCode) }} + {{ money.format(item.fullDiscountedUnitPrice, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig index 5cd542d3ced..3ef2fc2b4e6 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order_promotion_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %} @@ -6,5 +6,5 @@ {% set item = hookable_metadata.context.item %} - ~ {{ _money.format(item.units.first.adjustmentsTotal(order_promotion_adjustment), order.currencyCode) }} + ~ {{ money.format(item.units.first.adjustmentsTotal(order_promotion_adjustment), order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/subtotal.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/subtotal.html.twig index 427b4745d00..40a769f788a 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/subtotal.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/subtotal.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order_promotion_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %} {% set unit_promotion_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %} @@ -9,5 +9,5 @@ {% set subtotal = (item.unitPrice * item.quantity) + aggregated_unit_promotion_adjustments %} - {{ _money.format(subtotal, order.currencyCode) }} + {{ money.format(subtotal, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/tax.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/tax.html.twig index c0f5f802008..7f22c82d657 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/tax.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/tax.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {% set item = hookable_metadata.context.item %} @@ -7,9 +7,9 @@ {% set tax_excluded = sylius_admin_order_unit_tax_excluded(item) %} -
{{ _money.format(tax_excluded, order.currencyCode) }}
+
{{ money.format(tax_excluded, order.currencyCode) }}
-
{{ _money.format(tax_included, order.currencyCode) }}
+
{{ money.format(tax_included, order.currencyCode) }}
({{ 'sylius.ui.included_in_price'|trans }})
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/total.html.twig index 47ea196c072..48088699e3b 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/total.html.twig @@ -1,8 +1,8 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {% set item = hookable_metadata.context.item %} - {{ _money.format(item.total, order.currencyCode) }} + {{ money.format(item.total, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig index 93e3155f251..99b68a5afbe 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set unit_promotion_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %} @@ -6,5 +6,5 @@ {% set item = hookable_metadata.context.item %} - {{ _money.format(item.units.first.adjustmentsTotal(unit_promotion_adjustment), order.currencyCode) }} + {{ money.format(item.units.first.adjustmentsTotal(unit_promotion_adjustment), order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_price.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_price.html.twig index 3941a42ffd9..93718b47a0f 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_price.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_price.html.twig @@ -1,8 +1,8 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {% set item = hookable_metadata.context.item %} - {{ _money.format(item.unitPrice, order.currencyCode) }} + {{ money.format(item.unitPrice, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot.html.twig index 3c8d8bc1dbd..2eccbc10bca 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot.html.twig @@ -1,7 +1,3 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} - -{% set order = hookable_metadata.context.resource %} - {% hook 'foot' %} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/tax_total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/tax_total.html.twig index 483fbd23ec6..ad733fc19ee 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/tax_total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/tax_total.html.twig @@ -1,5 +1,5 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} -{{ _money.format(order.taxTotal, order.currencyCode) }} +{{ money.format(order.taxTotal, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/total.html.twig index 5c240d4914c..d3a66a1d9ac 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/total.html.twig @@ -1,5 +1,5 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} -{{ _money.format(order.itemsTotal, order.currencyCode) }} +{{ money.format(order.itemsTotal, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments.html.twig index 79ed322527f..d2450ba2f9c 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments.html.twig @@ -1,7 +1,3 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} - -{% set order = hookable_metadata.context.resource %} -
{% hook 'payments' %}
diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary.html.twig index 74bcacb5f4d..28c1569fd4e 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} @@ -21,7 +21,7 @@ {% block footer %}
{{ 'sylius.ui.order_total'|trans }}:
-
{{ _money.format(order.total, order.currencyCode) }}
+
{{ money.format(order.total, order.currencyCode) }}
{% endblock %} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/items_total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/items_total.html.twig index da610155930..0d3ff23db54 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/items_total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/items_total.html.twig @@ -1,8 +1,8 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {{ 'sylius.ui.items_total'|trans }}: - {{ _money.format(order.itemsTotal, order.currencyCode) }} + {{ money.format(order.itemsTotal, order.currencyCode) }} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/promotion_total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/promotion_total.html.twig index f8e25ae86bb..4bb68cb4a70 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/promotion_total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/promotion_total.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} @@ -17,7 +17,7 @@
{% for label, amount in promotion_adjustments %}
- {{ label }}: {{ _money.format(amount, order.currencyCode) }} + {{ label }}: {{ money.format(amount, order.currencyCode) }}
{% endfor %}
@@ -27,7 +27,7 @@ {% if total_adjustments == 0 %}

{{ 'sylius.ui.no_promotion'|trans }}

{% else %} - {{ _money.format(total_adjustments, order.currencyCode) }} + {{ money.format(total_adjustments, order.currencyCode) }} {% endif %} diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/shipping_total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/shipping_total.html.twig index 65aae0b12fd..572ee2d4cea 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/shipping_total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/shipping_total.html.twig @@ -1,4 +1,4 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order_shipping_promotion_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT') %} {% set shipping_adjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::SHIPPING_ADJUSTMENT') %} @@ -15,10 +15,10 @@ {% for shipment in order.shipments %}
{% for adjustment in shipment.adjustments(shipping_adjustment) %} - {{ adjustment.label }}: {{ _money.format(adjustment.amount, order.currencyCode) }} + {{ adjustment.label }}: {{ money.format(adjustment.amount, order.currencyCode) }} {% endfor %} {% for adjustment in shipment.adjustments(tax_adjustment) %} - {{ adjustment.label }}: {{ _money.format(adjustment.amount, order.currencyCode) }} + {{ adjustment.label }}: {{ money.format(adjustment.amount, order.currencyCode) }} {% if adjustment.isNeutral %} ({{ 'sylius.ui.included_in_price'|trans }}) {% endif %} @@ -27,11 +27,10 @@ {% endfor %} {% for label, amount in order_shipping_promotions %} -
{{ label }}: {{ _money.format(amount, order.currencyCode) }}
+
{{ label }}: {{ money.format(amount, order.currencyCode) }}
{% endfor %}
- {{ _money.format(order.shippingTotal, order.currencyCode) }} + {{ money.format(order.shippingTotal, order.currencyCode) }} - diff --git a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/tax_total.html.twig b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/tax_total.html.twig index ca0880fda16..c9425d2bf94 100644 --- a/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/tax_total.html.twig +++ b/src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary/tax_total.html.twig @@ -1,8 +1,8 @@ -{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %} +{% import '@SyliusAdmin/shared/helper/money.html.twig' as money %} {% set order = hookable_metadata.context.resource %} {{ 'sylius.ui.tax_total'|trans }}: - {{ _money.format(order.taxTotal, order.currencyCode) }} + {{ money.format(order.taxTotal, order.currencyCode) }}