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] Fix shipping totals in order summary #12875

Merged
merged 1 commit into from
Aug 17, 2021
Merged

[Admin] Fix shipping totals in order summary #12875

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 21 additions & 23 deletions src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/Summary/_totals.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,32 @@
<div class="ui relaxed divided list">
<div class="item"><strong>{{ 'sylius.ui.shipping'|trans }}:</strong></div>
{% for shipment in order.shipments %}
<div>
{% for adjustment in shipment.adjustments(shippingAdjustment) %}
<div class="item">
<div id="shipping-base-value" class="right floated">{{ money.format(adjustment.amount, order.currencyCode) }}</div>
<div class="content">
<div id="shipping-adjustment-label" class="description">
<strong>{{ adjustment.label }}</strong>:
</div>
{% for adjustment in shipment.adjustments(shippingAdjustment) %}
<div class="item">
<div id="shipping-base-value" class="right floated">{{ money.format(adjustment.amount, order.currencyCode) }}</div>
<div class="content">
<div id="shipping-adjustment-label" class="description">
<strong>{{ adjustment.label }}</strong>:
</div>
</div>
{% endfor %}
</div>
{% endfor %}

{% for adjustment in shipment.adjustments(taxAdjustment) %}
<div class="item{% if adjustment.isNeutral %} tax-disabled{% endif %}">
<div id="shipping-tax-value" class="right floated">
{{ money.format(adjustment.amount, order.currencyCode) }}
{% if adjustment.isNeutral %}
<small>({{ 'sylius.ui.included_in_price'|trans }})</small>
{% endif %}
</div>
<div class="content">
<div id="shipping-adjustment-label" class="description">
<strong{% if adjustment.isNeutral %} class="tax-disabled"{% endif %}>{{ adjustment.label }}</strong>:
</div>
{% for adjustment in shipment.adjustments(taxAdjustment) %}
<div class="item{% if adjustment.isNeutral %} tax-disabled{% endif %}">
<div id="shipping-tax-value" class="right floated">
{{ money.format(adjustment.amount, order.currencyCode) }}
{% if adjustment.isNeutral %}
<small>({{ 'sylius.ui.included_in_price'|trans }})</small>
{% endif %}
</div>
<div class="content">
<div id="shipping-adjustment-label" class="description">
<strong{% if adjustment.isNeutral %} class="tax-disabled"{% endif %}>{{ adjustment.label }}</strong>:
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
{% endfor %}
</div>
{% else %}
Expand Down