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 committed 2012-07-05 15:35:13 +00:00
1 parent ae4ebb9a1f
commit 991938edad
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/order/Order.php
+1 -1
View File
@@ -552,7 +552,7 @@ class OrderCore extends ObjectModel
$row['product_quantity'] = 0; $row['product_quantity'] = 0;
foreach ($selectedProducts as $key => $id_product) foreach ($selectedProducts as $key => $id_product)
if ($row['id_order_detail'] == $id_product) if ($row['id_order_detail'] == $id_product)
$row['producsvt_quantity'] = (int)($selectedQty[$key]); $row['product_quantity'] = (int)($selectedQty[$key]);
if (!$row['product_quantity']) if (!$row['product_quantity'])
continue; continue;
} }
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -683,7 +683,7 @@ class AdminOrdersControllerCore extends AdminController
$languages = Language::getLanguages($order); $languages = Language::getLanguages($order);
foreach ($languages as $language) 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 // Define a temporary name
$cartrule->name[$language['id_lang']] = 'V0C'.(int)($order->id_customer).'O'.(int)($order->id); $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); $products = $order->getProducts(false, $full_product_list, $full_quantity_list);
// Totals are stored in the order currency (or at least should be) // Totals are stored in the order currency (or at least should be)
$total = $order->getTotalProductsWithTaxes($products); $total = $order->getTotalProductsWithTaxes($products);
$discounts = $order->getDiscounts(true); $discounts = $order->getCartRules();
$total_tmp = $total; $total_tmp = $total;
foreach ($discounts as $discount) foreach ($discounts as $discount)
{ {