From 01bee20da67843729c00e4db5bc3fee0a3c04ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 23 Nov 2012 17:59:41 +0100 Subject: [PATCH] [-] FO: Availability was not displayed anymore on product listing #PSCFV-5698 --- classes/Product.php | 7 ++----- themes/default/css/product_list.css | 19 +++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/classes/Product.php b/classes/Product.php index ff4e1f8a1..8af855564 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -3671,14 +3671,11 @@ class ProductCore extends ObjectModel $row['specific_prices'] = $specific_prices; if ($row['id_product_attribute']) - { - $row['quantity_all_versions'] = $row['quantity']; - $row['quantity'] = Product::getQuantity( + $row['quantity_all_versions'] = Product::getQuantity( (int)$row['id_product'], - $row['id_product_attribute'], + 0, isset($row['cache_is_pack']) ? $row['cache_is_pack'] : null ); - } else $row['quantity'] = Product::getQuantity((int)$row['id_product']); diff --git a/themes/default/css/product_list.css b/themes/default/css/product_list.css index 1beda9686..ca49575c4 100644 --- a/themes/default/css/product_list.css +++ b/themes/default/css/product_list.css @@ -117,17 +117,16 @@ ul#product_list { #product_list li .content_price { margin:26px 0 15px 0; } - #product_list li .price { - display: block; - margin-bottom: 15px; - font-weight:bold; - font-size: 18px; - color:#990000 - } - #product_list li span.availability { - display:none; + #product_list li .price { + display: block; + margin-bottom: 15px; + font-weight:bold; + font-size: 18px; + color:#990000 + } + #product_list li span.availability { color: #488C40 - } + } #product_list li .ajax_add_to_cart_button { padding-left: 20px }