[Admin][Order][Show] Minor improvements

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
 

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 %}
 
 <td class="text-end" {{ sylius_test_html_attribute('discounted-unit-price') }}>
-    {{ _money.format(item.fullDiscountedUnitPrice, order.currencyCode) }}
+    {{ money.format(item.fullDiscountedUnitPrice, order.currencyCode) }}
 </td>

src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig

@@ -1,10 +1,10 @@
-{% 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 order = hookable_metadata.context.resource %}
 {% set item = hookable_metadata.context.item %}
 
 <td class="text-end" {{ sylius_test_html_attribute('distributed-order-discount') }}>
-    <span class="fst-italic">~ {{ _money.format(item.units.first.adjustmentsTotal(order_promotion_adjustment), order.currencyCode) }}</span>
+    <span class="fst-italic">~ {{ money.format(item.units.first.adjustmentsTotal(order_promotion_adjustment), order.currencyCode) }}</span>
 </td>

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 %}
 
 <td class="text-end" {{ sylius_test_html_attribute('subtotal') }}>
-    {{ _money.format(subtotal, order.currencyCode) }}
+    {{ money.format(subtotal, order.currencyCode) }}
 </td>

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) %}
 
 <td class="text-end">
-    <div {{ sylius_test_html_attribute('tax-excluded') }}>{{ _money.format(tax_excluded, order.currencyCode) }}</div>
+    <div {{ sylius_test_html_attribute('tax-excluded') }}>{{ money.format(tax_excluded, order.currencyCode) }}</div>
     <div class="text-secondary">
-        <div {{ sylius_test_html_attribute('tax-included') }}> {{ _money.format(tax_included, order.currencyCode) }}</div>
+        <div {{ sylius_test_html_attribute('tax-included') }}> {{ money.format(tax_included, order.currencyCode) }}</div>
         <small>({{ 'sylius.ui.included_in_price'|trans }})</small>
     </div>
 </td>

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 %}
 
 <td class="text-end" {{ sylius_test_html_attribute('total') }}>
-    {{ _money.format(item.total, order.currencyCode) }}
+    {{ money.format(item.total, order.currencyCode) }}
 </td>

src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig

@@ -1,10 +1,10 @@
-{% 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') %}
 
 {% set order = hookable_metadata.context.resource %}
 {% set item = hookable_metadata.context.item %}
 
 <td class="text-end" {{ sylius_test_html_attribute('unit-discount') }}>
-    {{ _money.format(item.units.first.adjustmentsTotal(unit_promotion_adjustment), order.currencyCode) }}
+    {{ money.format(item.units.first.adjustmentsTotal(unit_promotion_adjustment), order.currencyCode) }}
 </td>

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 %}
 
 <td class="text-end" {{ sylius_test_html_attribute('unit-price') }}>
-    {{ _money.format(item.unitPrice, order.currencyCode) }}
+    {{ money.format(item.unitPrice, order.currencyCode) }}
 </td>

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 %}
-
 <tfoot>
     <tr>
         {% hook 'foot' %}

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 %}
 
-<td class="text-end h3 mb-0">{{ _money.format(order.taxTotal, order.currencyCode) }}</td>
+<td class="text-end h3 mb-0">{{ money.format(order.taxTotal, order.currencyCode) }}</td>

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 %}
 
-<td class="text-end h3 mb-0" {{ sylius_test_html_attribute('items-total') }}>{{ _money.format(order.itemsTotal, order.currencyCode) }}</td>
+<td class="text-end h3 mb-0" {{ sylius_test_html_attribute('items-total') }}>{{ money.format(order.itemsTotal, order.currencyCode) }}</td>

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 %}
-
 <div class="card mb-3" {{ sylius_test_html_attribute('payments') }}>
     {% hook 'payments' %}
 </div>

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 %}
             <div class="d-flex justify-content-between">
                 <div class="h3 mb-0">{{ 'sylius.ui.order_total'|trans }}:</div>
-                <div class="h3 mb-0" {{ sylius_test_html_attribute('order-total') }}>{{ _money.format(order.total, order.currencyCode) }}</div>
+                <div class="h3 mb-0" {{ sylius_test_html_attribute('order-total') }}>{{ money.format(order.total, order.currencyCode) }}</div>
             </div>
         {% endblock %}
     </div>

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 %}
 
 <tr>
     <td><strong>{{ 'sylius.ui.items_total'|trans }}:</strong></td>
-    <td class="text-end" {{ sylius_test_html_attribute('total') }}>{{ _money.format(order.itemsTotal, order.currencyCode) }}</td>
+    <td class="text-end" {{ sylius_test_html_attribute('total') }}>{{ money.format(order.itemsTotal, order.currencyCode) }}</td>
 </tr>

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 @@
             <div class="text-muted text-md-end">
                 {% for label, amount in promotion_adjustments  %}
                     <div {{ sylius_test_html_attribute('promotion', label) }}>
-                        {{ label }}: <span {{ sylius_test_html_attribute('discount') }}>{{ _money.format(amount, order.currencyCode) }}</span>
+                        {{ label }}: <span {{ sylius_test_html_attribute('discount') }}>{{ money.format(amount, order.currencyCode) }}</span>
                     </div>
                 {% endfor %}
             </div>
@@ -27,7 +27,7 @@
         {% if total_adjustments == 0 %}
             <p>{{ 'sylius.ui.no_promotion'|trans }}</p>
         {% else %}
-            {{ _money.format(total_adjustments, order.currencyCode) }}
+            {{ money.format(total_adjustments, order.currencyCode) }}
         {% endif %}
     </td>
 </tr>

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 %}
                     <div {{ sylius_test_html_attribute('shipping', shipment.method.name) }}>
                         {% for adjustment in shipment.adjustments(shipping_adjustment) %}
-                            {{ adjustment.label }}: <span {{ sylius_test_html_attribute('base-value') }}>{{ _money.format(adjustment.amount, order.currencyCode) }}</span>
+                            {{ adjustment.label }}: <span {{ sylius_test_html_attribute('base-value') }}>{{ money.format(adjustment.amount, order.currencyCode) }}</span>
                         {% endfor %}
                         {% for adjustment in shipment.adjustments(tax_adjustment) %}
-                            {{ adjustment.label }}: <span {{ sylius_test_html_attribute('tax-value') }}>{{ _money.format(adjustment.amount, order.currencyCode) }}</span>
+                            {{ adjustment.label }}: <span {{ sylius_test_html_attribute('tax-value') }}>{{ money.format(adjustment.amount, order.currencyCode) }}</span>
                             {% if adjustment.isNeutral %}
                                 <small>({{ 'sylius.ui.included_in_price'|trans }})</small>
                             {% endif %}
@@ -27,11 +27,10 @@
                 {% endfor %}
 
                 {% for label, amount in order_shipping_promotions %}
-                    <div>{{ label }}: <span {{ sylius_test_html_attribute('shipping-promotion-discount') }}>{{ _money.format(amount, order.currencyCode) }}</span></div>
+                    <div>{{ label }}: <span {{ sylius_test_html_attribute('shipping-promotion-discount') }}>{{ money.format(amount, order.currencyCode) }}</span></div>
                 {% endfor %}
             </div>
         </div>
     </td>
-    <td class="text-end" {{ sylius_test_html_attribute('shipping-total') }}>{{ _money.format(order.shippingTotal, order.currencyCode) }}</td>
+    <td class="text-end" {{ sylius_test_html_attribute('shipping-total') }}>{{ money.format(order.shippingTotal, order.currencyCode) }}</td>
 </tr>
-

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 %}
 
 <tr>
     <td><strong>{{ 'sylius.ui.tax_total'|trans }}:</strong></td>
-    <td class="text-end" {{ sylius_test_html_attribute('tax-total') }}>{{ _money.format(order.taxTotal, order.currencyCode) }}</td>
+    <td class="text-end" {{ sylius_test_html_attribute('tax-total') }}>{{ money.format(order.taxTotal, order.currencyCode) }}</td>
 </tr>