// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
+4 -4
View File
@@ -28,7 +28,7 @@
class CustomizationCore
{
static public function getReturnedCustomizations($id_order)
public static function getReturnedCustomizations($id_order)
{
if (($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT ore.`id_order_return`, ord.`id_order_detail`, ord.`id_customization`, ord.`product_quantity`
@@ -42,7 +42,7 @@ class CustomizationCore
return $customizations;
}
static public function getOrderedCustomizations($id_cart)
public static function getOrderedCustomizations($id_cart)
{
if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `id_customization`, `quantity` FROM `'._DB_PREFIX_.'customization` WHERE `id_cart` = '.(int)($id_cart)))
return false;
@@ -52,7 +52,7 @@ class CustomizationCore
return $customizations;
}
static public function countCustomizationQuantityByProduct($customizations)
public static function countCustomizationQuantityByProduct($customizations)
{
$total = array();
foreach ($customizations AS $customization)
@@ -60,7 +60,7 @@ class CustomizationCore
return $total;
}
static public function getLabel($id_customization, $id_lang)
public static function getLabel($id_customization, $id_lang)
{
if (!$id_customization || !$id_lang)
return false;