[-] FO : changed confusing "free shipping" mention #PSCFV-4151
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17463 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
c847c68f49
commit
9686562d85
1 file changed
+7
-8
@@ -591,7 +591,7 @@ var ajaxCart = {
|
|||||||
updateCartEverywhere : function(jsonData) {
|
updateCartEverywhere : function(jsonData) {
|
||||||
$('.ajax_cart_total').text(jsonData.productTotal);
|
$('.ajax_cart_total').text(jsonData.productTotal);
|
||||||
|
|
||||||
if (parseFloat(jsonData.shippingCostFloat) > 0)
|
if (parseFloat(jsonData.shippingCostFloat) > 0 || jsonData.nbTotalProducts < 1)
|
||||||
$('.ajax_cart_shipping_cost').text(jsonData.shippingCost);
|
$('.ajax_cart_shipping_cost').text(jsonData.shippingCost);
|
||||||
else
|
else
|
||||||
$('.ajax_cart_shipping_cost').html(freeShippingTranslation);
|
$('.ajax_cart_shipping_cost').html(freeShippingTranslation);
|
||||||
@@ -601,23 +601,22 @@ var ajaxCart = {
|
|||||||
|
|
||||||
this.nb_total_products = jsonData.nbTotalProducts;
|
this.nb_total_products = jsonData.nbTotalProducts;
|
||||||
|
|
||||||
if(parseInt(jsonData.nbTotalProducts) > 0)
|
if (parseInt(jsonData.nbTotalProducts) > 0)
|
||||||
{
|
{
|
||||||
$('.ajax_cart_no_product').hide();
|
$('.ajax_cart_no_product').hide();
|
||||||
$('.ajax_cart_quantity').text(jsonData.nbTotalProducts);
|
$('.ajax_cart_quantity').text(jsonData.nbTotalProducts);
|
||||||
$('.ajax_cart_quantity').fadeIn('slow');
|
$('.ajax_cart_quantity').fadeIn('slow');
|
||||||
$('.ajax_cart_total').fadeIn('slow');
|
$('.ajax_cart_total').fadeIn('slow');
|
||||||
|
|
||||||
if(parseInt(jsonData.nbTotalProducts) > 1)
|
if (parseInt(jsonData.nbTotalProducts) > 1)
|
||||||
{
|
{
|
||||||
$('.ajax_cart_product_txt').each( function () {
|
$('.ajax_cart_product_txt').each( function () {
|
||||||
$(this).hide ();
|
$(this).hide();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.ajax_cart_product_txt_s').each( function () {
|
$('.ajax_cart_product_txt_s').each( function () {
|
||||||
$(this).show();
|
$(this).show();
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -632,9 +631,9 @@ var ajaxCart = {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$('.ajax_cart_quantity, .ajax_cart_product_txt_s, .ajax_cart_product_txt, .ajax_cart_total').each( function () {
|
$('.ajax_cart_quantity, .ajax_cart_product_txt_s, .ajax_cart_product_txt, .ajax_cart_total').each(function(){
|
||||||
$(this).hide();
|
$(this).hide();
|
||||||
});
|
});
|
||||||
$('.ajax_cart_no_product').show('slow');
|
$('.ajax_cart_no_product').show('slow');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user