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

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-03-09 09:19:30 +00:00
parent 724c96fbde
commit 50a44277db
54 changed files with 297 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+1 -1
View File
@@ -203,7 +203,7 @@ class CarrierCore extends ObjectModel
{
if (!parent::delete())
return false;
return (Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) &&
return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) &&
$this->deleteTaxRulesGroup(Shop::getShops(true, null, true)));
}
classes/Cart.php
+1 -1
View File
@@ -1028,7 +1028,7 @@ class CartCore extends ObjectModel
{
Cache::clean('Cart::getCartRules'.$this->id);
$result = Db::getInstance()->Execute('
$result = Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'cart_cart_rule`
WHERE `id_cart_rule` = '.(int)$id_cart_rule.'
AND `id_cart` = '.(int)$this->id.'
classes/CartRule.php
+27 -27
View File
@@ -131,15 +131,15 @@ class CartRuleCore extends ObjectModel
Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', CartRule::isCurrentlyUsed($this->def['table'], true));
$r = Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
$r &= Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
$r = Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_cart_rule` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_combination` WHERE `id_cart_rule_1` = '.(int)$this->id.' OR `id_cart_rule_2` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_group` WHERE `id_cart_rule` = '.(int)$this->id);
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_product_rule_group` NOT IN (SELECT `id_product_rule_group` FROM `'._DB_PREFIX_.'cart_rule_product_rule_group`)');
$r &= Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
return $r;
}
@@ -153,26 +153,26 @@ class CartRuleCore extends ObjectModel
*/
public static function copyConditions($id_cart_rule_source, $id_cart_rule_destination)
{
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_shop` (`id_cart_rule`, `id_shop`)
(SELECT '.(int)$id_cart_rule_destination.', id_shop FROM `'._DB_PREFIX_.'cart_rule_shop` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_carrier` (`id_cart_rule`, `id_carrier`)
(SELECT '.(int)$id_cart_rule_destination.', id_carrier FROM `'._DB_PREFIX_.'cart_rule_carrier` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_group` (`id_cart_rule`, `id_group`)
(SELECT '.(int)$id_cart_rule_destination.', id_group FROM `'._DB_PREFIX_.'cart_rule_group` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_country` (`id_cart_rule`, `id_country`)
(SELECT '.(int)$id_cart_rule_destination.', id_country FROM `'._DB_PREFIX_.'cart_rule_country` WHERE `id_cart_rule` = '.(int)$id_cart_rule_source.')');
Db::getInstance()->Execute('
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'cart_rule_combination` (`id_cart_rule_1`, `id_cart_rule_2`)
(SELECT '.(int)$id_cart_rule_destination.', IF(id_cart_rule_1 != '.(int)$id_cart_rule_source.', id_cart_rule_1, id_cart_rule_2) FROM `'._DB_PREFIX_.'cart_rule_combination`
WHERE `id_cart_rule_1` = '.(int)$id_cart_rule_source.' OR `id_cart_rule_2` = '.(int)$id_cart_rule_source.')');
// Todo : should be changed soon, be must be copied too
// Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id);
// Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
// Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule` WHERE `id_cart_rule` = '.(int)$this->id);
// Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'cart_rule_product_rule_value` WHERE `id_product_rule` NOT IN (SELECT `id_product_rule` FROM `'._DB_PREFIX_.'cart_rule_product_rule`)');
}
/**
@@ -287,7 +287,7 @@ class CartRuleCore extends ObjectModel
return array();
$productRuleGroups = array();
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT *
FROM '._DB_PREFIX_.'cart_rule_product_rule_group prg
WHERE prg.id_cart_rule = '.(int)$this->id, false);
@@ -310,7 +310,7 @@ class CartRuleCore extends ObjectModel
return array();
$productRules = array();
$results = Db::getInstance()->ExecuteS('
$results = Db::getInstance()->executeS('
SELECT *
FROM '._DB_PREFIX_.'cart_rule_product_rule pr
LEFT JOIN '._DB_PREFIX_.'cart_rule_product_rule_value prv ON pr.id_product_rule = prv.id_product_rule
@@ -520,7 +520,7 @@ class CartRuleCore extends ObjectModel
switch ($productRule['type'])
{
case 'attributes':
$cartAttributes = Db::getInstance()->ExecuteS('
$cartAttributes = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, pac.`id_attribute`, cp.`id_product_attribute`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON cp.id_product_attribute = pac.id_product_attribute
@@ -540,7 +540,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'products':
$cartProducts = Db::getInstance()->ExecuteS('
$cartProducts = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`
FROM `'._DB_PREFIX_.'cart_product` cp
WHERE cp.`id_cart` = '.(int)$context->cart->id.'
@@ -558,7 +558,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'categories':
$cartCategories = Db::getInstance()->ExecuteS('
$cartCategories = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, catp.`id_category`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'category_product` catp ON cp.id_product = catp.id_product
@@ -577,7 +577,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'manufacturers':
$cartManufacturers = Db::getInstance()->ExecuteS('
$cartManufacturers = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, p.`id_manufacturer`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product
@@ -596,7 +596,7 @@ class CartRuleCore extends ObjectModel
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'suppliers':
$cartSuppliers = Db::getInstance()->ExecuteS('
$cartSuppliers = Db::getInstance()->executeS('
SELECT cp.quantity, cp.`id_product`, p.`id_supplier`
FROM `'._DB_PREFIX_.'cart_product` cp
LEFT JOIN `'._DB_PREFIX_.'product` p ON cp.id_product = p.id_product
@@ -795,7 +795,7 @@ class CartRuleCore extends ObjectModel
protected function getCartRuleCombinations()
{
$array = array();
$array['selected'] = Db::getInstance()->ExecuteS('
$array['selected'] = Db::getInstance()->executeS('
SELECT cr.*, crl.*, 1 as selected
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
@@ -809,7 +809,7 @@ class CartRuleCore extends ObjectModel
OR '.(int)$this->id.' = id_cart_rule_2
)
)');
$array['unselected'] = Db::getInstance()->ExecuteS('
$array['unselected'] = Db::getInstance()->executeS('
SELECT cr.*, crl.*, 1 as selected
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
@@ -833,7 +833,7 @@ class CartRuleCore extends ObjectModel
if (!Validate::isLoadedObject($this) OR $this->{$type.'_restriction'} == 0)
{
$array['selected'] = Db::getInstance()->ExecuteS('
$array['selected'] = Db::getInstance()->executeS('
SELECT t.*'.($i18n ? ', tl.*' : '').', 1 as selected
FROM `'._DB_PREFIX_.$type.'` t
'.($i18n ? 'LEFT JOIN `'._DB_PREFIX_.$type.'_lang` tl ON (t.id_'.$type.' = tl.id_'.$type.' AND tl.id_lang = '.(int)Context::getContext()->language->id.')' : '').'
@@ -964,7 +964,7 @@ class CartRuleCore extends ObjectModel
*/
public static function getCartsRuleByCode($name, $id_lang)
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT cr.*, crl.*
FROM '._DB_PREFIX_.'cart_rule cr
LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.')
classes/Country.php
+1 -1
View File
@@ -104,7 +104,7 @@ class CountryCore extends ObjectModel
{
if (!parent::delete())
return false;
return Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id);
return Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_country WHERE id_country = '.(int)$this->id);
}
/**
classes/Customer.php
+1 -1
View File
@@ -744,7 +744,7 @@ class CustomerCore extends ObjectModel
public function getWsGroups()
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT cg.`id_group` as id
FROM '._DB_PREFIX_.'customer_group cg
WHERE cg.`id_customer` = '.(int)$this->id);
classes/Image.php
+1 -1
View File
@@ -276,7 +276,7 @@ class ImageCore extends ObjectModel
foreach ($image_ids as $image_id)
$query .= '('.(int)$id_product_attribute.', '.(int)$image_id.'), ';
$query = rtrim($query, ', ');
return DB::getInstance()->Execute($query);
return DB::getInstance()->execute($query);
}
/**
classes/Notification.php
+3 -3
View File
@@ -58,7 +58,7 @@ class NotificationCore
public function installDb()
{
Db::getInstance(_PS_USE_SQL_SLAVE_)->Execute('ALTER TABLE `'._DB_PREFIX_.'employee`
Db::getInstance(_PS_USE_SQL_SLAVE_)->execute('ALTER TABLE `'._DB_PREFIX_.'employee`
ADD `id_last_order` INT(10) unsigned NOT NULL default "0"
ADD `id_last_customer_message` INT(10) unsigned NOT NULL default "0"
ADD `id_last_message` INT(10) unsigned NOT NULL default "0"');
@@ -87,7 +87,7 @@ class NotificationCore
ORDER BY `id_'.bqSQL($type).'` DESC';
$json = array();
foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql) as $key => $value)
foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql) as $key => $value)
{
$customer = null;
$order = null;
@@ -126,7 +126,7 @@ class NotificationCore
if (in_array($type, $this->types))
// We update the last item viewed
return Db::getInstance()->Execute('
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'employee`
SET `id_last_'.bqSQL($type).'` = (SELECT MAX(`id_'.$type.'`)
FROM `'._DB_PREFIX_.(($type == 'order') ? bqSQL($type).'s' : bqSQL($type)).'`)
classes/Product.php
+85 -108
View File
@@ -539,18 +539,18 @@ class ProductCore extends ObjectModel
$return = true;
$result = Db::getInstance()->executeS('
SELECT `id_product`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` = '.(int)$id_category.'
ORDER BY `position`');
$sizeof = count($result);
for ($i = 0; $i < $sizeof; $i++)
$return &= Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'category_product`
SET `position` = '.(int)$i.'
SELECT `id_product`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` = '.(int)$id_category.'
AND `id_product` = '.(int)$result[$i]['id_product']);
ORDER BY `position`
');
$total = count($result);
for ($i = 0; $i < $total; $i++)
$return &= Db::getInstance()->update('category_product', array(
'position' => $i,
), '`id_category` = '.(int)$id_category.' AND `id_product` = '.(int)$result[$i]['id_product']);
return $return;
}
@@ -603,23 +603,16 @@ class ProductCore extends ObjectModel
public static function updateDefaultAttribute($id_product)
{
$id_product_attribute = Product::getDefaultAttribute($id_product);
Db::getInstance()->execute(
'UPDATE '._DB_PREFIX_.'product
SET cache_default_attribute = '.(int)$id_product_attribute.'
WHERE id_product = '.(int)$id_product.'
LIMIT 1'
);
Db::getInstance()->update('product', array(
'cache_default_attribute' => (int)Product::getDefaultAttribute($id_product),
), 'id_product = '.(int)$id_product);
}
public static function updateIsVirtual($id_product)
{
Db::getInstance()->execute(
'UPDATE '._DB_PREFIX_.'product
SET is_virtual = 1
WHERE id_product = '.(int)$id_product.'
LIMIT 1'
);
Db::getInstance()->update('product', array(
'is_virtual' => (int)$id_product,
), 'id_product = '.(int)$id_product);
}
/**
@@ -706,12 +699,7 @@ class ProductCore extends ObjectModel
public function deleteFromSupplier()
{
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'product_supplier`
WHERE `id_product` = '.(int)$this->id
);
return $return;
return Db::getInstance()->delete('product_supplier', 'id_product = '.(int)$this->id);
}
/**
@@ -753,12 +741,13 @@ class ProductCore extends ObjectModel
foreach ($categories as $new_id_categ)
if (!in_array($new_id_categ, $current_categories))
$product_cats[] = '('.$new_id_categ.', '.(int)$this->id.', '.$new_categ_pos[$new_id_categ].')';
if (count($product_cats))
return Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'category_product` (`id_category`, `id_product`, `position`)
VALUES '.implode(',', $product_cats));
$product_cats[] = array(
'id_category' => (int)$new_id_categ,
'id_product' => (int)$this->id,
'position' => (int)$new_categ_pos[$new_id_categ],
);
Db::getInstance()->insert('category_product', $product_cats);
return true;
}
@@ -775,10 +764,12 @@ class ProductCore extends ObjectModel
return false;
// get max position in each categories
$result = Db::getInstance()->executeS('SELECT `id_category`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).')
AND id_product = '.$this->id.'');
$result = Db::getInstance()->executeS('
SELECT `id_category`
FROM `'._DB_PREFIX_.'category_product`
WHERE `id_category` NOT IN('.implode(',', array_map('intval', $categories)).')
AND id_product = '.$this->id
);
foreach ($result as $categ_to_delete)
$this->deleteCategory($categ_to_delete['id_category']);
// if none are found, it's an error
@@ -809,12 +800,8 @@ class ProductCore extends ObjectModel
WHERE `id_product` = '.(int)$this->id.'
AND id_category = '.(int)$id_category.''
);
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'category_product`
WHERE `id_product` = '.(int)$this->id.'
AND id_category = '.(int)$id_category.''
);
$return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id.' AND id_category = '.(int)$id_category);
if ($clean_positions === true)
foreach ($result as $row)
$this->cleanPositions((int)$row['id_category']);
@@ -829,11 +816,7 @@ class ProductCore extends ObjectModel
*/
public function deleteCategories($clean_positions = false)
{
$return = Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'category_product`
WHERE `id_product` = '.(int)$this->id
);
$return = Db::getInstance()->delete('category_product', 'id_product = '.(int)$this->id);
if ($clean_positions === true)
{
$result = Db::getInstance()->executeS(
@@ -855,18 +838,8 @@ class ProductCore extends ObjectModel
*/
public function deleteTags()
{
return (
Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'product_tag`
WHERE `id_product` = '.(int)$this->id
)
&&
Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'tag`
WHERE `id_tag` NOT IN (SELECT `id_tag`
FROM `'._DB_PREFIX_.'product_tag`)'
)
);
return Db::getInstance()->delete('product_tag', 'id_product = '.(int)$this->id)
&& Db::getInstance()->delete('tag', 'id_tag NOT IN (SELECT id_tag FROM '._DB_PREFIX_.'product_tag)');
}
/**
@@ -876,10 +849,7 @@ class ProductCore extends ObjectModel
*/
public function deleteCartProducts()
{
return Db::getInstance()->execute(
'DELETE FROM `'._DB_PREFIX_.'cart_product`
WHERE `id_product` = '.(int)$this->id
);
return Db::getInstance()->delete('cart_product', 'id_product` = '.(int)$this->id);
}
/**
@@ -908,9 +878,10 @@ class ProductCore extends ObjectModel
public static function getProductAttributePrice($id_product_attribute)
{
$rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `price`
FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` = '.(int)$id_product_attribute);
SELECT `price`
FROM `'._DB_PREFIX_.'product_attribute`
WHERE `id_product_attribute` = '.(int)$id_product_attribute
);
return $rq['price'];
}
@@ -1205,23 +1176,22 @@ class ProductCore extends ObjectModel
*/
public function deleteDefaultAttributes()
{
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_attribute`
SET `default_on` = 0
WHERE `id_product` = '.(int)$this->id);
return Db::getInstance()->update('product_attribute', array(
'default_on' => 0,
), 'id_product = '.(int)$this->id);
}
public function setDefaultAttribute($id_product_attribute)
{
return Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product_attribute`
SET `default_on` = 1
WHERE `id_product` = '.(int)$this->id.'
AND `id_product_attribute` = '.(int)$id_product_attribute) &&
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'product`
SET `cache_default_attribute` = '.(int)$id_product_attribute.'
WHERE `id_product` = '.(int)$this->id.' LIMIT 1');
$result = Db::getInstance()->update('product_attribute', array(
'default_on' => 1
), 'id_product` = '.(int)$this->id.' AND `id_product_attribute` = '.(int)$id_product_attribute);
$result &= Db::getInstance()->update('product', array(
'cache_default_attribute' => (int)$id_product_attribute,
), 'id_product = '.(int)$this->id);
return $result;
}
/**
@@ -1518,18 +1488,16 @@ class ProductCore extends ObjectModel
public function addAttributeCombinationMultiple($id_attributes, $combinations)
{
$attributes_list = '';
$attributes_list = array();
foreach ($id_attributes as $nb => $id_product_attribute)
if (isset($combinations[$nb]))
foreach ($combinations[$nb] as $id_attribute)
$attributes_list .= '('.(int)$id_product_attribute.','.(int)$id_attribute.'),';
$attributes_list[] = array(
'id_product_attribute' => (int)$id_product_attribute,
'id_attribute' => (int)$id_attribute,
);
$attributes_list = rtrim($attributes_list, ',');
return Db::getInstance()->execute(
'INSERT INTO `'._DB_PREFIX_.'product_attribute_combination` (`id_product_attribute`, `id_attribute`)
VALUES '.$attributes_list
);
return Db::getInstance()->insert('product_attribute_combination', $attributes_list);
}
/**
@@ -3275,11 +3243,15 @@ class ProductCore extends ObjectModel
$tags = Db::getInstance()->executeS('SELECT `id_tag` FROM `'._DB_PREFIX_.'product_tag` WHERE `id_product` = '.(int)$id_product_old);
if (!Db::getInstance()->NumRows())
return true;
$query = 'INSERT INTO `'._DB_PREFIX_.'product_tag` (`id_product`, `id_tag`) VALUES';
$data = array();
foreach ($tags as $tag)
$query .= ' ('.(int)$id_product_new.', '.(int)$tag['id_tag'].'),';
$query = rtrim($query, ',');
return Db::getInstance()->execute($query);
$data[] = array(
'id_product' => (int)$id_product_new,
'id_tag' => (int)$tag['id_tag'],
);
return Db::getInstance()->insert('product_tag', $data);
}
public static function duplicateDownload($id_product_old, $id_product_new)
@@ -3291,18 +3263,19 @@ class ProductCore extends ObjectModel
if (!$results)
return true;
$query = 'INSERT INTO `'._DB_PREFIX_.'product_download`
(`id_product`, `display_filename`, `filename`, `date_add`, `date_expiration`, `nb_days_accessible`, `nb_downloadable`, `active`, `is_shareable`)
VALUES';
$data = array();
foreach ($results as $row)
$query .= ' ('.(int)$id_product_new.', \''.pSQL($row['display_filename']).'\', \''.pSQL($row['filename']).
'\', \''.pSQL($row['date_add']).'\', \''.pSQL($row['date_expiration']).'\', '.(int)$row['nb_days_accessible'].
', '.(int)$row['nb_downloadable'].', '.(int)$row['active'].'), '.(int)$row['is_shareable'].'),';
$query = rtrim($query, ',');
return Db::getInstance()->execute($query);
$data[] = array(
'id_product' => (int)$id_product_new,
'display_filename' => pSQL($row['display_filename']),
'filename' => pSQL($row['filename']),
'date_expiration' => pSQL($row['date_expiration']),
'nb_days_accessible' => (int)$row['nb_days_accessible'],
'nb_downloadable' => (int)$row['nb_downloadable'],
'active' => (int)$row['active'],
'is_shareable' => (int)$row['is_shareable']
);
return Db::getInstance()->insert('product_download', $data);
}
/**
@@ -3421,12 +3394,16 @@ class ProductCore extends ObjectModel
if (isset($customizations['labels']))
{
$query = 'INSERT INTO `'._DB_PREFIX_.'customization_field_lang` (`id_customization_field`, `id_lang`, `name`) VALUES ';
$query = 'INSERT INTO `'._DB_PREFIX_.'` (`id_customization_field`, `id_lang`, `name`) VALUES ';
$data = array();
foreach ($customizations['labels'][$old_customization_field_id] as $customization_label)
$query .= '('.(int)$customization_field_id.', '.(int)$customization_label['id_lang'].', \''.pSQL($customization_label['name']).'\'), ';
$data = array(
'id_customization_field' => (int)$customization_field_id,
'id_lang' => (int)$customization_label['id_lang'],
'name' => pSQL($customization_label['name']),
);
$query = rtrim($query, ', ');
if (!Db::getInstance()->execute($query))
if (!Db::getInstance()->insert('customization_field_lang', $data))
return false;
}
}
classes/Search.php
+5 -5
View File
@@ -401,9 +401,9 @@ class SearchCore
if ($full)
{
$db->Execute('TRUNCATE '._DB_PREFIX_.'search_index');
$db->Execute('TRUNCATE '._DB_PREFIX_.'search_word');
$db->Execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0');
$db->execute('TRUNCATE '._DB_PREFIX_.'search_index');
$db->execute('TRUNCATE '._DB_PREFIX_.'search_word');
$db->execute('UPDATE '._DB_PREFIX_.'product SET indexed = 0');
}
else
{
@@ -420,7 +420,7 @@ class SearchCore
foreach ($products as $product)
$ids[] = (int)$product['id_product'];
if (count($ids))
$db->Execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')');
$db->execute('DELETE FROM '._DB_PREFIX_.'search_index WHERE id_product IN ('.implode(',', $ids).')');
}
// Every fields are weighted according to the configuration in the backend
@@ -516,7 +516,7 @@ class SearchCore
if (count($queryArray))
{
// The words are inserted...
$db->Execute('
$db->execute('
INSERT IGNORE INTO '._DB_PREFIX_.'search_word (id_lang, id_shop, word)
VALUES '.implode(',', $queryArray));
}
classes/SpecificPrice.php
+1 -1
View File
@@ -142,7 +142,7 @@ class SpecificPriceCore extends ObjectModel
public static function deleteByIdCart($id_cart, $id_product = false, $id_product_attribute = false)
{
return Db::getInstance()->Execute('
return Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'specific_price`
WHERE id_cart='.(int)$id_cart.
($id_product ? ' AND id_product='.(int)$id_product.' AND id_product_attribute='.(int)$id_product_attribute : ''));
classes/order/Order.php
+1 -1
View File
@@ -1395,7 +1395,7 @@ class OrderCore extends ObjectModel
*/
public function getShipping()
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT DISTINCT oc.`id_order_invoice`, oc.`weight`, oc.`shipping_cost_tax_excl`, oc.`shipping_cost_tax_incl`, c.`url`, oc.`id_carrier`, c.`name` as `state_name`, oc.`date_add`, "Delivery" as `type`, "true" as `can_edit`, oc.`tracking_number`, oc.`id_order_carrier`
FROM `'._DB_PREFIX_.'orders` o
LEFT JOIN `'._DB_PREFIX_.'order_history` oh
classes/order/OrderInvoice.php
+2 -2
View File
@@ -361,7 +361,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
@@ -409,7 +409,7 @@ class OrderInvoiceCore extends ObjectModel
*/
public static function getByDeliveryDateInterval($date_from, $date_to)
{
$order_invoice_list = Db::getInstance()->ExecuteS('
$order_invoice_list = Db::getInstance()->executeS('
SELECT oi.*
FROM `'._DB_PREFIX_.'order_invoice` oi
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
classes/order/OrderPayment.php
+1 -1
View File
@@ -79,7 +79,7 @@ class OrderPaymentCore extends ObjectModel
*/
public static function getByOrderId($id_order)
{
return Db::getInstance()->ExecuteS('
return Db::getInstance()->executeS('
SELECT *
FROM `'._DB_PREFIX_.'order_payment`
WHERE `id_order` = '.(int)$id_order);