From d5d87993057901fbb424018f276d6df6370d3209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?=
 <francois.gaillard@prestashop.com>
Date: Mon, 6 Feb 2012 09:46:58 +0000
Subject: [PATCH] [-] FO : Fixed JS & translations for products specifics
 prices (quantity discount)

---
 themes/default/js/product.js | 9 +++++++--
 themes/default/lang/fr.php   | 6 ++++--
 themes/default/product.tpl   | 5 ++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index e9b9b801f..ffb1843d8 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -442,11 +442,16 @@ function displayDiscounts(combination)
 {
     $('#quantityDiscount table tbody tr').each(function() {
         if (($(this).attr('id') != 'quantityDiscount_0') &&
-            ($(this).attr('id') != 'quantityDiscount_'+combination))
+            ($(this).attr('id') != 'quantityDiscount_'+combination) &&
+            ($(this).attr('id') != 'noQuantityDiscount'))
             $(this).fadeOut('slow');
     });
 
-    $('#quantityDiscount_'+combination).show();
+    if ($('#quantityDiscount_'+combination).length != 0) {
+        $('#quantityDiscount_'+combination).show();
+        $('#noQuantityDiscount').hide();
+    } else
+        $('#noQuantityDiscount').show();
 }
 
 // Serialscroll exclude option bug ?
diff --git a/themes/default/lang/fr.php b/themes/default/lang/fr.php
index a470d1aca..df180db01 100644
--- a/themes/default/lang/fr.php
+++ b/themes/default/lang/fr.php
@@ -644,8 +644,10 @@ $_LANG['product_a134618182b99ff9151d7e0b6b92410a'] = '(ne sera pas compris dans
 $_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'par';
 $_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Ajouter au panier';
 $_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Prix dégressifs';
-$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantités';
-$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantité';
+$_LANG['product_f5bf48aa40cad7891eb709fcf1fde128'] = 'produit';
+$_LANG['product_1b793b463a1c296e1327d7048c201cc3'] = 'à partir de (qté)';
+$_LANG['product_e2dc6c48c56de466f6d13781796abf3d'] = 'remise';
+$_LANG['product_7415fae0281735630b1a29782b60c27c'] = 'Il n\'y a pas de remise en fonction de la quantité pour ce produit.';
 $_LANG['product_71948aa4f6e12cdaa5e2e63a5eb8f142'] = 'En savoir plus';
 $_LANG['product_7dcd185f890fd28f69d1ed210292d77f'] = 'Fiche technique';
 $_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Télécharger';
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index a3aa9b500..5f98e5010 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -452,7 +452,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
 	</div>
 </div>
 
-{if isset($quantity_discounts) && $quantity_discounts}
+{if (isset($quantity_discounts) && count($quantity_discounts) > 0)}
 <!-- quantity discount -->
 <ul class="idTabs clearfix">
 	<li><a href="#discount" style="cursor: pointer" class="selected">{l s='Quantity discount'}</a></li>
@@ -467,6 +467,9 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
             </tr>
         </thead>
 		<tbody>
+            <tr id="noQuantityDiscount">
+                <td colspan='3'>{l s='There is not any quantity discount for this product.'}</td>
+            </tr>
             {foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'}
             <tr id="quantityDiscount_{$quantity_discount.id_product_attribute}">
                 <td>