[-] FO : #PSFV-272 - Add translation + try to not increase global qty of product on choosing "Ship to multiple addresses"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11986 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:35:42 +00:00
parent 2e09799884
commit e7e22788e7
6 changed files with 43 additions and 19 deletions
@@ -67,7 +67,7 @@ function cleanSelectAddressDelivery()
 			if (address_count < 2) // Need at least two address to allow skipping products to multiple address
 				$($(item).find('option[value=-2]')).remove();
 			else if($($(item).find('option[value=-2]')).length == 0)
-				$(item).append($('<option value="-2">Ship to an other address</option>')); // @todo add translation
+				$(item).append($('<option value="-2">' + ShipToAnOtherAddress + '</option>'));
 		});
 	}
 }
@@ -707,9 +707,22 @@ function multishippingMode(it)
 				cleanSelectAddressDelivery();
 				$('#fancybox-content').append($('<div class="multishipping_close_container"><a id="multishipping-close" class="button_large" href="#">' + CloseTxt + '</a></div>'));
 				$('#multishipping-close').click(function() {
+					var newTotalQty = 0;
+					$('#fancybox-content .cart_quantity_input').each(function(){
+						newTotalQty += parseInt($(this).val());
+					});
+					if (newTotalQty != totalQty) {
+						if(!confirm(QtyChanged)) {
+							return false;
+						}
+					}
 					$.fancybox.close();
 					return false;
 				});
+				totalQty = 0;
+				$('#fancybox-content .cart_quantity_input').each(function(){
+					totalQty += parseInt($(this).val());
+				});
 			}
 		});
 	}