|
@@ -187,7 +187,7 @@ discard block |
|
|
block discarded – undo |
|
187
|
187
|
private function getAvailableDate($row) { |
|
188
|
188
|
($row['available_date'] != '0000-00-00') ? $dater = $row['available_date'] : $dater = ''; |
|
189
|
189
|
return $dater; |
|
190
|
|
- } |
|
|
190
|
+ } |
|
191
|
191
|
|
|
192
|
192
|
/** |
|
193
|
193
|
* @param null|string $id_product_attribute |
|
@@ -210,7 +210,7 @@ discard block |
|
|
block discarded – undo |
|
210
|
210
|
*/ |
|
211
|
211
|
private function getCombination($id_product_attribute) |
|
212
|
212
|
{ |
|
213
|
|
- $sql = 'SELECT ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, agl.`public_name` AS public_group_name, |
|
|
213
|
+ $sql = 'SELECT ag.`id_attribute_group`, ag.`is_color_group`, agl.`name` AS group_name, agl.`public_name` AS public_group_name, |
|
214
|
214
|
a.`id_attribute`, al.`name` AS attribute_name, a.`color` AS attribute_color, pas.`id_product_attribute`, |
|
215
|
215
|
IFNULL(stock.quantity, 0) as quantity, pc.price as base_price, pc.id_product, pas.`price`, pas.`ecotax`, pas.`weight`, |
|
216
|
216
|
pas.`default_on`, pa.`reference`, pas.`unit_price_impact`, pl.name as product_name, |
|
@@ -239,7 +239,7 @@ discard block |
|
|
block discarded – undo |
|
239
|
239
|
} |
|
240
|
240
|
|
|
241
|
241
|
public function getAttributeBase($attribute) { |
|
242
|
|
- $sql = 'SELECT al.* |
|
|
242
|
+ $sql = 'SELECT al.* |
|
243
|
243
|
FROM '._DB_PREFIX_.'product_attribute_combination pac |
|
244
|
244
|
JOIN '._DB_PREFIX_.'attribute_lang al ON (pac.id_attribute = al.id_attribute AND al.id_lang=1) |
|
245
|
245
|
WHERE pac.id_product_attribute='.(int) $attribute; |
|
@@ -379,7 +379,7 @@ discard block |
|
|
block discarded – undo |
|
379
|
379
|
|
|
380
|
380
|
if (is_array($result)) |
|
381
|
381
|
{ |
|
382
|
|
- foreach($result as $key => $value) |
|
|
382
|
+ foreach($result as $key => $value) |
|
383
|
383
|
{ |
|
384
|
384
|
$result['orderprice'] = $this->getOrderPrice($product); |
|
385
|
385
|
$result['category_default'] $this->getProductCat($value['cat_id']); |