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

[-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16248 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-07-05 15:35:13 +00:00
parent ae4ebb9a1f
commit 991938edad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -683,7 +683,7 @@ class AdminOrdersControllerCore extends AdminController
$languages = Language::getLanguages($order);
foreach ($languages as $language)
{
$voucher->description[$language['id_lang']] = $this->l('Credit Slip for order #').(int)($order->id);
$cartrule->description[$language['id_lang']] = $this->l('Credit Slip for order #').(int)($order->id);
// Define a temporary name
$cartrule->name[$language['id_lang']] = 'V0C'.(int)($order->id_customer).'O'.(int)($order->id);
}
@@ -702,7 +702,7 @@ class AdminOrdersControllerCore extends AdminController
$products = $order->getProducts(false, $full_product_list, $full_quantity_list);
// Totals are stored in the order currency (or at least should be)
$total = $order->getTotalProductsWithTaxes($products);
$discounts = $order->getDiscounts(true);
$discounts = $order->getCartRules();
$total_tmp = $total;
foreach ($discounts as $discount)
{