Fix table prefix

src/list/products.inc.php

@@ -10,8 +10,8 @@
 	<td><select name="aller[]" multiple>
 	<?php
 	$sql = 'SELECT f.id_feature, f.id_feature_value, fl.value
-		FROM ps_feature_value f
-		LEFT JOIN ps_feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
+		FROM '.DB_P_PREFIX.'feature_value f
+		LEFT JOIN '.DB_P_PREFIX.'feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
 		WHERE f.id_feature=11';
 	$q = DB::p_select($sql);
 	$aller = [];
@@ -34,40 +34,40 @@
 </form>
 <?php
 
-$sql = '(SELECT p.id_product, 0 as id_product_attribute, i.id_image, p.reference, pl.name, p.weight, p.wholesale_price, p.price, IF(px.reduction_type="amount", p.price+px.price*px.reduction, 0) as price_pro, s.quantity, GROUP_CONCAT(DISTINCT CONCAT(sl.dluo, "&nbsp;(", sl.stock, ")") SEPARATOR ";") dluo, cl.name category_name, col.name country_name, GROUP_CONCAT(DISTINCT fl.value SEPARATOR ";") features
-	FROM ps_product p
-	INNER JOIN ps_product_lang pl ON pl.id_product=p.id_product AND pl.id_lang=1
-	LEFT JOIN ps_product_attribute pa ON pa.id_product=p.id_product
-	LEFT JOIN ps_image i ON i.id_product=p.id_product
-	LEFT JOIN ps_stock_available s ON s.id_product=p.id_product AND s.id_product_attribute=0
-	LEFT JOIN ps_products_dlc_dluo sl ON sl.id_product=p.id_product AND sl.id_combinaison=0 AND sl.is_current_stock>0
-	LEFT JOIN ps_category c ON c.id_category=p.id_category_default
-	LEFT JOIN ps_category_lang cl ON cl.id_category=c.id_category AND cl.id_lang=1
-	LEFT JOIN ps_address sa ON sa.id_supplier=p.id_supplier
-	LEFT JOIN ps_country_lang col ON col.id_country=sa.id_country AND col.id_lang=1
-	LEFT JOIN ps_feature_product fp ON fp.id_product=p.id_product
-	LEFT JOIN ps_feature_value f ON f.id_feature_value=fp.id_feature_value AND f.id_feature=11
-	LEFT JOIN ps_feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
-	LEFT JOIN ps_specific_price px ON px.id_product=p.id_product AND px.id_product_attribute=0 AND px.id_group=5
+$sql = '(SELECT p.id_product, 0 as id_product_attribute, i.id_image, p.reference, pl.name, p.weight, p.wholesale_price, p.price, IF(px.reduction_type="amount", p.price+px.price*px.reduction, 0) as price_pro, s.quantity'.(PRODUCT_LOT ?', GROUP_CONCAT(DISTINCT CONCAT(sl.dluo, "&nbsp;(", sl.stock, ")") SEPARATOR ";") dluo' :'').', cl.name category_name, col.name country_name, GROUP_CONCAT(DISTINCT fl.value SEPARATOR ";") features
+	FROM '.DB_P_PREFIX.'product p
+	INNER JOIN '.DB_P_PREFIX.'product_lang pl ON pl.id_product=p.id_product AND pl.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'product_attribute pa ON pa.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'image i ON i.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'stock_available s ON s.id_product=p.id_product AND s.id_product_attribute=0
+	'.(PRODUCT_LOT ?'LEFT JOIN '.DB_P_PREFIX.'products_dlc_dluo sl ON sl.id_product=p.id_product AND sl.id_combinaison=0 AND sl.is_current_stock>0' :'').'
+	LEFT JOIN '.DB_P_PREFIX.'category c ON c.id_category=p.id_category_default
+	LEFT JOIN '.DB_P_PREFIX.'category_lang cl ON cl.id_category=c.id_category AND cl.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'address sa ON sa.id_supplier=p.id_supplier
+	LEFT JOIN '.DB_P_PREFIX.'country_lang col ON col.id_country=sa.id_country AND col.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'feature_product fp ON fp.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'feature_value f ON f.id_feature_value=fp.id_feature_value AND f.id_feature=11
+	LEFT JOIN '.DB_P_PREFIX.'feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'specific_price px ON px.id_product=p.id_product AND px.id_product_attribute=0 AND px.id_group=5
 	WHERE p.active=1 AND pa.id_product_attribute IS NULL
 	GROUP BY p.id_product)
 	UNION
-	(SELECT p.id_product, pa.id_product_attribute, pi.id_image, pa.reference, pl.name, pa.weight, pa.wholesale_price, pa.price, IF(px.reduction_type="amount", pa.price+px.price*px.reduction, 0) as price_pro, s.quantity, GROUP_CONCAT(DISTINCT CONCAT(sl.dluo, "&nbsp;(", sl.stock, ")") SEPARATOR "; ") dluo, cl.name category_name, col.name country_name, GROUP_CONCAT(DISTINCT fl.value SEPARATOR "; ") features
-	FROM ps_product p
-	INNER JOIN ps_product_lang pl ON pl.id_product=p.id_product AND pl.id_lang=1
-	INNER JOIN ps_product_attribute pa ON pa.id_product=p.id_product
-	LEFT JOIN ps_image i ON i.id_product=p.id_product
-	LEFT JOIN ps_product_attribute_image pi ON pi.id_product_attribute=pa.id_product_attribute
-	LEFT JOIN ps_stock_available s ON s.id_product=p.id_product AND s.id_product_attribute=pa.id_product_attribute
-	LEFT JOIN ps_products_dlc_dluo sl ON sl.id_product=p.id_product AND sl.id_combinaison=pa.id_product_attribute AND sl.is_current_stock>0
-	LEFT JOIN ps_category c ON c.id_category=p.id_category_default
-	LEFT JOIN ps_category_lang cl ON cl.id_category=c.id_category AND cl.id_lang=1
-	LEFT JOIN ps_address sa ON sa.id_supplier=p.id_supplier
-	LEFT JOIN ps_country_lang col ON col.id_country=sa.id_country AND col.id_lang=1
-	LEFT JOIN ps_feature_product fp ON fp.id_product=p.id_product
-	LEFT JOIN ps_feature_value f ON f.id_feature_value=fp.id_feature_value AND f.id_feature=11
-	LEFT JOIN ps_feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
-	LEFT JOIN ps_specific_price px ON px.id_product=p.id_product AND px.id_product_attribute=pa.id_product_attribute AND px.id_group=5
+	(SELECT p.id_product, pa.id_product_attribute, pi.id_image, pa.reference, pl.name, pa.weight, pa.wholesale_price, pa.price, IF(px.reduction_type="amount", pa.price+px.price*px.reduction, 0) as price_pro, s.quantity'.(PRODUCT_LOT ?', GROUP_CONCAT(DISTINCT CONCAT(sl.dluo, "&nbsp;(", sl.stock, ")") SEPARATOR ";") dluo' :'').', cl.name category_name, col.name country_name, GROUP_CONCAT(DISTINCT fl.value SEPARATOR "; ") features
+	FROM '.DB_P_PREFIX.'product p
+	INNER JOIN '.DB_P_PREFIX.'product_lang pl ON pl.id_product=p.id_product AND pl.id_lang=1
+	INNER JOIN '.DB_P_PREFIX.'product_attribute pa ON pa.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'image i ON i.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'product_attribute_image pi ON pi.id_product_attribute=pa.id_product_attribute
+	LEFT JOIN '.DB_P_PREFIX.'stock_available s ON s.id_product=p.id_product AND s.id_product_attribute=pa.id_product_attribute
+	'.(PRODUCT_LOT ?'LEFT JOIN '.DB_P_PREFIX.'products_dlc_dluo sl ON sl.id_product=p.id_product AND sl.id_combinaison=0 AND sl.is_current_stock>0' :'').'
+	LEFT JOIN '.DB_P_PREFIX.'category c ON c.id_category=p.id_category_default
+	LEFT JOIN '.DB_P_PREFIX.'category_lang cl ON cl.id_category=c.id_category AND cl.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'address sa ON sa.id_supplier=p.id_supplier
+	LEFT JOIN '.DB_P_PREFIX.'country_lang col ON col.id_country=sa.id_country AND col.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'feature_product fp ON fp.id_product=p.id_product
+	LEFT JOIN '.DB_P_PREFIX.'feature_value f ON f.id_feature_value=fp.id_feature_value AND f.id_feature=11
+	LEFT JOIN '.DB_P_PREFIX.'feature_value_lang fl ON fl.id_feature_value=f.id_feature_value AND fl.id_lang=1
+	LEFT JOIN '.DB_P_PREFIX.'specific_price px ON px.id_product=p.id_product AND px.id_product_attribute=pa.id_product_attribute AND px.id_group=5
 	WHERE p.active=1
 	GROUP BY pa.id_product_attribute)
 	ORDER BY name
@@ -117,7 +117,7 @@ while($row=$q->fetch_assoc()) {
 	echo '<td align="right">'.str_replace('.', ',', round($row['price'], 2)).'</td>';
 	echo '<td align="right">'.str_replace('.', ',', round($row['price_pro'], 2)).'</td>';
 	echo '<td align="right">'.$row['quantity'].'</td>';
-	echo '<td>'.$row['dluo'].'</td>';
+	echo '<td>'.(PRODUCT_LOT ?$row['dluo'] :'').'</td>';
 	echo '<td>'.$row['features'].'</td>';
 	foreach($aller as $i=>$j) {
 		echo '<td>'.(is_numeric(strpos($row['features'], $j)) ?$j :'').'</td>';