// Improving adding address with order-opc

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13256 b9a71923-0436-4b27-9f14-aed3839534dd

themes/default/css/global.css

@@ -825,7 +825,6 @@ table#cart_summary .cart_total_price .total_price_container {
 
 .multishipping_close_container {
 	text-align: center;
-	margin-top: -30px;
 }
 
 /* step 2 - authentification ******************************************************************* */

themes/default/js/order-opc.js

@@ -678,6 +678,7 @@ function multishippingMode(it)
 		$('#address_invoice_form').show();
 		
 		$('#link_multishipping_form').click(function() {return false;});
+		$('.address_add a').attr('href', addressMultishippingUrl);
 		
 		$('#link_multishipping_form').fancybox({
 			'transitionIn': 'elastic',
@@ -740,6 +741,7 @@ function multishippingMode(it)
 		} else {
 			$('#address_invoice_form').show();
 		}
+		$('.address_add a').attr('href', addressUrl);
 		
 		// Disable multi address shipping
 		$.ajax({
@@ -772,4 +774,7 @@ $(document).ready(function() {
 		$('.addressesAreEquals').hide();
 		$('.addressesAreEquals').find('input').attr('checked', false);
 	}
+	
+	if (open_multishipping_fancybox)
+		$('#link_multishipping_form').click();
 });

themes/default/order-address.tpl

@@ -75,6 +75,9 @@
 	var txtProduct = "{l s='product'}";
 	var txtProducts = "{l s='products'}";
 	{/if}
+	
+	var addressMultishippingUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")}";
+	var addressUrl = "{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")}";
 
 	var formatedAddressFieldsValuesList = new Array();
 
@@ -195,6 +198,7 @@
 				{else}
 				var multishipping_mode = false;
 				{/if}
+				var open_multishipping_fancybox = {$open_multishipping_fancybox|intval};
 			</script>
 		</div>
 	{/if}