Changeset 4487
- Timestamp:
- 06/26/12 12:45:27 (11 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/catalog/admin/includes/modules/pages/products.php
r4482 r4487 230 230 'text'=>__('products table heading manufacturers'), 231 231 'width'=>'12%', 232 'default'=>true,233 232 ); 234 233 } … … 248 247 'text'=>__('products table heading featured'), 249 248 'width'=>'12%', 250 'default'=>true,251 249 ); 252 250 } … … 265 263 'text'=>__('products table heading price'), 266 264 ); 267 268 /** 269 TODO A revoir , appel des sub modules 270 */ 271 if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER')) 272 self::$allfields['s.specials_new_products_price']= array( 273 'sort'=>false, 274 'alias'=>'sprice', 275 'text'=>__('@specials products table heading special price'), 276 ); 265 /* 266 self::$allfields['p.products_price']= array( 267 'sort'=>false, 268 'alias'=>'price_ttx', 269 'text'=>__('products table heading price taxe'), 270 ); */ 277 271 278 272 self::$allfields['p.products_tax_class_id']= array( … … 479 473 $list_type .=$key.','; 480 474 else{ 481 $allcats = tep_get_status_array('product');475 $allcats = categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$new_languages_id , 'exclude'=>array('0'))); 482 476 foreach($allcats as $row) 483 477 $list_type .=$row['id'].','; … … 715 709 716 710 case 'delete_product_confirm': 717 if (isset($_POST['products_id']) && isset($_POST['product_categories']) && is_array($_POST['product_categories'])) { 711 712 if (isset($_POST['products_id']) /*&& isset($_POST['product_categories']) && is_array($_POST['product_categories'])*/ ) { 718 713 $product_id = tep_db_prepare_input($_POST['products_id']); 719 $product_categories = $_POST['product_categories'];714 $product_categories = (array)@$_POST['product_categories']; 720 715 721 716 sqlproduct::delete(array('id'=>$product_id, 'catarray'=>$product_categories ) ); … … 907 902 908 903 $action=self::$action; 909 904 // var_dump($action); 910 905 switch ($action) { 911 906 case 'detail': … … 978 973 } 979 974 980 /**981 TODO A revoir , appel des sub modules982 */983 if(tep_cst_define('MODULE_ACAPRO_SPECIAL_SORT_ORDER'))984 $query_raw .= " LEFT JOIN " . TABLE_SPECIALS . " s ON( s.products_id =p.products_id AND s.status > 0) ";985 986 987 975 $query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : ''). 988 976 " GROUP BY p.products_id ". … … 1019 1007 */ 1020 1008 case 'delete': 1009 self::GetDBValue(); 1021 1010 case 'copy_to': 1022 1011 case 'new': … … 1211 1200 $ord =array(); 1212 1201 1213 if( DataTypes::is_active('categorie')) {1202 if( ! DataTypes::is_active('categorie')) { 1214 1203 /// complete cats list 1215 1204 $objres=$DB->query("SELECT categories_name FROM " . TABLE_CATEGORIES . " c, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' "); … … 1222 1211 } 1223 1212 1224 if( DataTypes::is_active('featured')) {1225 /// complete featuredlist1213 if( ! DataTypes::is_active('featured')) { 1214 /// complete cats list 1226 1215 // $objres=$DB->query("SELECT categories_name FROM " . TABLE_FEATURED . " f, " . TABLE_CATEGORIES_DESCRIPTION . " cd , " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c WHERE c.categories_id=cd.categories_id AND cd.language_id = '" . (int)$languages_id . "' AND c.categories_id=p2c.categories_id and products_id='".$item['id']."' AND c.categories_id <> '".$item['categories_id']."' "); 1227 1216 // $rescat=$objres->fetchAllAssoc(); … … 1239 1228 foreach(self::$InitInfo['modele']['listing'] as $k=>$row){ 1240 1229 if($k == 'action') $ord[$k]=self::ButtonRowsActions($item); 1241 elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href=" '.tep_href_link(self::FILENAME).'" title="">'.$item['title'].'</a>';1230 elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="#" title="">'.$item['title'].'</a>'; 1242 1231 elseif($k == 'status') $ord[$k]=self::RowStatus($item); 1243 1232 // elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
