dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix #PSCFV-4520

Browse Source
This commit is contained in:
rGaillard
2012-09-28 16:45:23 +00:00
parent ae63fa5aeb
commit b070c2dd70
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+2 -2
View File
@@ -109,7 +109,7 @@
<!-- Left column --> <!-- Left column -->
<div style="width: 49%; float:left;"> <div style="width: 49%; float:left;">
<!-- Change status form --> <!-- Change status form -->
<form action="{$currentIndex}&viewOrder&token={$smarty.get.token}" method="post"> <form action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post">
<select id="id_order_state" name="id_order_state"> <select id="id_order_state" name="id_order_state">
{foreach from=$states item=state} {foreach from=$states item=state}
{if $state['id_order_state'] != $currentState->id} {if $state['id_order_state'] != $currentState->id}
@@ -264,7 +264,7 @@
<legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend> <legend><img src="../img/admin/money.gif" /> {l s='Payment'}</legend>
{if (!$order->valid && sizeof($currencies) > 1)} {if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&viewOrder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}"> <form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p> <p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p>
<label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label> <label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label>
<select name="new_currency"> <select name="new_currency">
controllers/admin/AdminOrdersController.php
+9 -10
View File
@@ -934,19 +934,18 @@ class AdminOrdersControllerCore extends AdminController
'ecotax', 'ecotax',
'product_price', 'product_price',
'reduction_amount', 'reduction_amount',
'total_shipping', 'total_shipping_price_tax_excl',
'total_shipping_tax_excl', 'total_shipping_price_tax_incl',
'total_shipping_tax_incl', 'total_price_tax_incl',
'total_products', 'total_price_tax_excl',
'total_products_wt',
'total_paid',
'total_paid_tax_incl',
'total_paid_tax_excl',
'total_paid_real',
'product_quantity_discount', 'product_quantity_discount',
'purchase_supplier_price', 'purchase_supplier_price',
'reduction_amount',
'reduction_amount_tax_incl', 'reduction_amount_tax_incl',
'reduction_amount_tax_excl' 'reduction_amount_tax_excl',
'unit_price_tax_incl',
'unit_price_tax_excl',
); );
foreach ($fields as $field) foreach ($fields as $field)
$order_detail->{$field} = Tools::convertPriceFull($order_detail->{$field}, $old_currency, $currency); $order_detail->{$field} = Tools::convertPriceFull($order_detail->{$field}, $old_currency, $currency);