Merge pull request Sylius#2671 from aitboudad/fix_use_sylius_money

[account order][sylius_money] use order currency.
A-Marwan · Apr 22, 2015 · aa5b7b3 · aa5b7b3
2 parents f81bf90 + 21a9684
commit aa5b7b3
Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/Order/_detail.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/Order/_detail.html.twig
@@ -45,8 +45,8 @@
                     {{ include('SyliusWebBundle:Frontend/Product:_variant.html.twig', {'variant': item.variant}) }}
                 </td>
                 <td>{{ item.quantity }}</td>
-                <td>{{ item.unitPrice|sylius_money }}</td>
-                <td>{{ item.total|sylius_money }}</td>
+                <td>{{ item.unitPrice|sylius_money(order.currency) }}</td>
+                <td>{{ item.total|sylius_money(order.currency) }}</td>
             </tr>
         {% endfor %}
         </tbody>
@@ -57,39 +57,39 @@
                         {{ 'sylius.order.items_total'|trans }}
                     </span>
                 </th>
-                <th>{{ order.itemsTotal|sylius_money }}</th>
+                <th>{{ order.itemsTotal|sylius_money(order.currency) }}</th>
             </tr>
             <tr>
                 <td colspan="3">
                     <span class="pull-right">
                         {{ 'sylius.order.tax_total'|trans }}
                     </span>
                 </td>
-                <td>{{ order.adjustmentsTotal(taxAdjustment)|sylius_money }}</td>
+                <td>{{ order.adjustmentsTotal(taxAdjustment)|sylius_money(order.currency) }}</td>
             </tr>
             <tr>
                 <td colspan="3">
                     <span class="pull-right">
                         {{ 'sylius.order.shipping_total'|trans }}
                     </span>
                 </td>
-                <td>{{ order.adjustmentsTotal(shippingAdjustment)|sylius_money }}</td>
+                <td>{{ order.adjustmentsTotal(shippingAdjustment)|sylius_money(order.currency) }}</td>
             </tr>
             <tr>
                 <td colspan="3">
                     <span class="pull-right">
                         {{ 'sylius.order.promotion_total'|trans }}
                     </span>
                 </td>
-                <td>{{ order.adjustmentsTotal(promotionAdjustment)|sylius_money }}</td>
+                <td>{{ order.adjustmentsTotal(promotionAdjustment)|sylius_money(order.currency) }}</td>
             </tr>
             <tr>
                 <th colspan="3">
                     <span class="pull-right">
                         {{ 'sylius.order.total'|trans }}
                     </span>
                 </th>
-                <th>{{ order.total|sylius_money }}</th>
+                <th>{{ order.total|sylius_money(order.currency) }}</th>
             </tr>
         </tfoot>
     </table>

diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/Order/_list.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/Order/_list.html.twig
@@ -16,7 +16,7 @@
                 <tr class="order" id="order-{{ order.number }}">
                     <td>{{ order.createdAt|date }}</td>
                     <td>{{ order.number }}</td>
-                    <td>{{ order.total|sylius_money }}</td>
+                    <td>{{ order.total|sylius_money(order.currency) }}</td>
                     <td>
                         {% include "SyliusWebBundle:Frontend/Account:Order/_state.html.twig" %}
                     </td>
@@ -42,4 +42,4 @@
     {% else %}
         <p>{{ 'sylius.account.order.empty'|trans }}</p>
     {% endif %}
-</div>
+</div>