Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Admin][Order][Show] Minor improvements #16292

Merged
merged 1 commit into from
May 23, 2024
Merged

[Admin][Order][Show] Minor improvements #16292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion features/admin/order/managing_orders/order_details/seeing_order_with_items.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...inBundle/templates/order/show/content/sections/items/body/discounted_unit_price.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ...dle/templates/order/show/content/sections/items/body/distributed_order_discount.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ...us/Bundle/AdminBundle/templates/order/show/content/sections/items/body/subtotal.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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') %}
Expand All @@ -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>
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/tax.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}
Expand All @@ -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>
4 changes: 2 additions & 2 deletions ...ylius/Bundle/AdminBundle/templates/order/show/content/sections/items/body/total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ...ndle/AdminBundle/templates/order/show/content/sections/items/body/unit_discount.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions .../Bundle/AdminBundle/templates/order/show/content/sections/items/body/unit_price.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% import '@SyliusAdmin/shared/helper/money.html.twig' as _money %}

{% set order = hookable_metadata.context.resource %}

<tfoot>
<tr>
{% hook 'foot' %}
Expand Down
4 changes: 2 additions & 2 deletions ...s/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/tax_total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions ...ylius/Bundle/AdminBundle/templates/order/show/content/sections/items/foot/total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/payments.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/templates/order/show/content/sections/summary.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}

Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...us/Bundle/AdminBundle/templates/order/show/content/sections/summary/items_total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 3 additions & 3 deletions ...undle/AdminBundle/templates/order/show/content/sections/summary/promotion_total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}

Expand All @@ -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>
Expand All @@ -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>
11 changes: 5 additions & 6 deletions ...Bundle/AdminBundle/templates/order/show/content/sections/summary/shipping_total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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') %}
Expand All @@ -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 %}
Expand All @@ -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>

4 changes: 2 additions & 2 deletions ...lius/Bundle/AdminBundle/templates/order/show/content/sections/summary/tax_total.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading