From 2d183b8eaa0e53a6f96c3d7b6bbc96ade1593426 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Fri, 16 Dec 2011 09:42:23 +0000
Subject: [PATCH] // BugFix : summary-cart

---
 themes/default/css/global.css                 | 9 +++++----
 themes/default/js/cart-summary.js             | 9 +++------
 themes/default/shopping-cart-product-line.tpl | 2 +-
 themes/default/shopping-cart.tpl              | 8 ++++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 22403586c..40c5f2554 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -717,7 +717,7 @@ a.price_discount_delete {
 	text-align: right
 }
 
-.cart_total_price #total_price {
+.cart_total_price #total_price_container {
 	border-right:none;
 }
 
@@ -769,11 +769,11 @@ table#cart_summary .cart_total_price td.cart_voucher {
 .cart_total_price #total_price_without_tax,
 .cart_total_price #total_tax,
 .cart_total_price #total_shipping {text-align:right}
-.cart_total_price #total_price {
+.cart_total_price #total_price_container {
 	padding:0;
 	border-bottom:1px solid #999
 }
-.cart_total_price #total_price p {
+.cart_total_price #total_price_container p {
 	display:block;
 	padding:8px;
 	font-weight:bold;
@@ -781,7 +781,7 @@ table#cart_summary .cart_total_price td.cart_voucher {
 	text-transform:uppercase;
 	background:#333
 }
-.cart_total_price #total_price span {
+.cart_total_price #total_price_container span {
 	display:block;
 	padding:15px;
 	font-weight:bold;
@@ -1763,3 +1763,4 @@ div.star_hover a, div.star a:hover { background-position: 0 -12px }
 /* ************************************************************************************************
       xxxxx
 ************************************************************************************************ */
+
diff --git a/themes/default/js/cart-summary.js b/themes/default/js/cart-summary.js
index bf693cebf..f3ca117fb 100644
--- a/themes/default/js/cart-summary.js
+++ b/themes/default/js/cart-summary.js
@@ -33,13 +33,10 @@ $(document).ready(function()
 		$('.cart_quantity_down').unbind('click').live('click', function(){ downQuantity($(this).attr('id').replace('cart_quantity_down_', '')); return false; });
 		$('.cart_quantity_delete' ).unbind('click').live('click', function(){ deleteProductFromSummary($(this).attr('id')); return false; });
 		$('.cart_quantity_input').typeWatch({ highlight: true, wait: 600, captureLength: 0, callback: updateQty });
-		
-		$('.cart_address_delivery').live('change', function(){ changeAddressDelivery($(this)); });
-	}
-	else
-	{
-		$('.cart_address_delivery').change(function(){ submit(); });
 	}
+	
+	$('.cart_address_delivery').live('change', function(){ changeAddressDelivery($(this)); });
+	
 	cleanSelectAddressDelivery();
 });
 
diff --git a/themes/default/shopping-cart-product-line.tpl b/themes/default/shopping-cart-product-line.tpl
index f333817b4..65b11e9a7 100644
--- a/themes/default/shopping-cart-product-line.tpl
+++ b/themes/default/shopping-cart-product-line.tpl
@@ -85,7 +85,7 @@
 	<td class="cart_delete">
 	{if !isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0}
 		<div>
-			<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}" href="{$link->getPageLink('cart.php', true)}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;token={$token_cart}">{l s='Delete'}</a>
+			<a rel="nofollow" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")}">{l s='Delete'}</a>
 		</div>
 	{/if}
 	</td>	
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 94ab250e9..07526dda3 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -205,14 +205,14 @@
 				{/if}
 				</td>
 				{if $use_taxes}
-				<td colspan="2" class="price" id="total_price">
+				<td colspan="2" class="price" id="total_price_container">
 					<p>{l s='Total:'}</p>
-					<span>{displayPrice price=$total_price}</span>
+					<span id="total_price">{displayPrice price=$total_price}</span>
 				</td>
 				{else}
-				<td colspan="2" id="total_price" class="price">
+				<td colspan="2" class="price" id="total_price_container">
 					<p>{l s='Total:'}</p>
-					<span>{displayPrice price=$total_price_without_tax}</span>
+					<span id="total_price">{displayPrice price=$total_price_without_tax}</span>
 				</td>
 				{/if}
 			</tr>