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

// cleaning code (norm / perf)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8837 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2011-09-28 09:37:29 +00:00
parent 7dcd300c7d
commit 966250e202
8 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CartController.php
+2
View File
@@ -65,6 +65,8 @@ class CartControllerCore extends FrontController
require_once(_PS_MODULE_DIR_.'/blockcart/blockcart-ajax.php');
}
public function init()
{
parent::init();
controllers/front/ParentOrderController.php
+5 -1
View File
@@ -260,7 +260,11 @@ class ParentOrderControllerCore extends FrontController
foreach ($summary['products'] AS $key => &$product)
{
$product['quantity'] = $product['cart_quantity'];// for compatibility with 1.2 themes
$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], !Product::getTaxCalculationMethod(), $product['id_product_attribute']);
$product['price_without_specific_price'] = Product::getPriceStatic($product['id_product'], !Product::getTaxCalculationMethod(), $product['id_product_attribute'], 2);
if (Product::getTaxCalculationMethod())
$product['is_discounted'] = $product['price_without_specific_price'] != $product['price'];
else
$product['is_discounted'] = $product['price_without_specific_price'] != $product['price_wt'];
}
$this->context->smarty->assign($summary);
controllers/front/ProductController.php
+1 -2
View File
@@ -277,8 +277,7 @@ class ProductControllerCore extends FrontController
$groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] = 0;
$groups[$row['id_attribute_group']]['attributes_quantity'][$row['id_attribute']] += (int)($row['quantity']);
//french date format
$availableDate = date('j-m-Y',strtotime($row['available_date']));
$availableDate = Tools::displayDate(strtotime($row['available_date']), $this->context->language->id);
$combinations[$row['id_product_attribute']]['attributes_values'][$row['id_attribute_group']] = $row['attribute_name'];
$combinations[$row['id_product_attribute']]['attributes'][] = (int)($row['id_attribute']);