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

// update tab "attributes" in smarty template + update action in list in ajax

Browse Source
This commit is contained in:
lLefevre
2011-12-04 10:42:05 +00:00
parent e1b7cd86af
commit 570ecde717
28 changed files with 1110 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+1 -2
View File
@@ -1503,8 +1503,7 @@ class AdminControllerCore extends Controller
$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
$this->addJquery();
$this->addjQueryPlugin(array('cluetip', 'hoverIntent'));
$this->addJqueryPlugin('scrollTo');
$this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo'));
$this->addJS(array(
_PS_JS_DIR_.'admin.js',
classes/HelperList.php
+19 -1
View File
@@ -432,7 +432,7 @@ class HelperListCore extends Helper
$tpl->assign(array(
'href' => $this->currentIndex.'&'.$this->identifier.'='.$id.'&update'.$this->table.'&token='.($token != null ? $token : $this->token),
'action' => self::$cache_lang['Edit'],
'id' => (int)$id
'id' => $id
));
return $tpl->fetch();
@@ -461,6 +461,24 @@ class HelperListCore extends Helper
return $tpl->fetch();
}
/**
* Display delete action link
*/
protected function displayDefaultLink($token = null, $id)
{
$tpl = $this->createTemplate('list_action_default.tpl');
if (!array_key_exists('Default', self::$cache_lang))
self::$cache_lang['Default'] = $this->l('Default');
$tpl->assign(array_merge($this->tpl_delete_link_vars, array(
'href' => $this->currentIndex.'&'.$this->identifier.'='.$id.'&delete'.$this->table.'&token='.($token != null ? $token : $this->token),
'action' => self::$cache_lang['Default'],
'id' => $id,
)));
return $tpl->fetch();
}
/**
* Display list header (filtering, pagination and column names)
*/
classes/Product.php
+26
View File
@@ -1669,6 +1669,32 @@ class ProductCore extends ObjectModel
return Db::getInstance()->executeS($sql);
}
/**
* Get product attribute combinaison by id_product_attribute
*
* @param integer $id_product_attribute
* @param integer $id_lang Language id
* @return array Product attribute combinaison by id_product_attribute
*/
public function getAttributeCombinaisonsById($id_product_attribute, $id_lang)
{
if (!Combination::isFeatureActive())
return array();
$sql = 'SELECT pa.*, ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, al.`name` AS attribute_name,
a.`id_attribute`, pa.`unit_price_impact`, IFNULL(stock.quantity, 0) as quantity
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON pac.`id_product_attribute` = pa.`id_product_attribute`
LEFT JOIN `'._DB_PREFIX_.'attribute` a ON a.`id_attribute` = pac.`id_attribute`
LEFT JOIN `'._DB_PREFIX_.'attribute_group` ag ON ag.`id_attribute_group` = a.`id_attribute_group`
LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)$id_lang.')
LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND agl.`id_lang` = '.(int)$id_lang.')
'.Product::sqlStock('pa', 'pa').'
WHERE pa.`id_product` = '.(int)$this->id.'
AND pa.`id_product_attribute` = '.(int)$id_product_attribute.'
ORDER BY pa.`id_product_attribute`';
return Db::getInstance()->executeS($sql);
}
public function getCombinationImages($id_lang)
{
if (!Combination::isFeatureActive())