From 68b4b1c6bc699c1d086b3db8bdd9acbe253293ef Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Mon, 13 Feb 2012 14:15:23 +0000
Subject: [PATCH] // 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
---
 classes/Cart.php                         | 2 +-
 controllers/front/OrderOpcController.php | 3 ++-
 themes/default/css/global.css            | 1 -
 themes/default/js/order-opc.js           | 5 +++++
 themes/default/order-address.tpl         | 4 ++++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index a8b74fbcc..ebd40d83b 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -2470,7 +2470,7 @@ class CartCore extends ObjectModel
 			'total_price' => $this->getOrderTotal(),
 			'total_tax' => $total_tax,
 			'total_price_without_tax' => $this->getOrderTotal(false),
-			'is_multi_address_delivery' => $this->isMultiAddressDelivery(),
+			'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1),
 			'free_ship' => 0,
 			'carrier' => new Carrier($this->id_carrier, $id_lang),
 		);
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index c2ed09c35..b69794fd7 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -41,7 +41,8 @@ class OrderOpcControllerCore extends ParentOrderController
 		if ($this->nbProducts)
 			$this->context->smarty->assign('virtual_cart', false);
 		
-		$this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery());
+		$this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1));
+		$this->context->smarty->assign('open_multishipping_fancybox', (int)Tools::getValue('multi-shipping') == 1);
 		
 		$this->isLogged = (bool)($this->context->customer->id && Customer::customerIdExistsStatic((int)$this->context->cookie->id_customer));
 
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 818916047..a99a6ff2d 100644
--- a/themes/default/css/global.css
+++ b/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 ******************************************************************* */
diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index 6e8b7e507..3ac08c990 100644
--- a/themes/default/js/order-opc.js
+++ b/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();
 });
diff --git a/themes/default/order-address.tpl b/themes/default/order-address.tpl
index 5177ae83d..ec86b9c76 100644
--- a/themes/default/order-address.tpl
+++ b/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}