From abbdb4d165c3fb841a0aa2b1fd8c23ca6e878e2b Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 14:08:51 +0200
Subject: [PATCH 1/2] [-] FO : address alias lost

---
 themes/default/address.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index f193fec91..689440edd 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -220,7 +220,7 @@ $(function(){ldelim}
 		</p>
 		<p class="required text" id="adress_alias">
 			<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
-			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{else if !isset($select_address)}{l s='My address'}{/if}" />
+			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias}{elseif !$select_address}{l s='My address'}{/if}" />
 		</p>
 	</fieldset>
 	<p class="submit2">

From ce02baf6587015a7687c98c19994a6cd2ec2b8df Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 16 Apr 2013 14:09:37 +0200
Subject: [PATCH 2/2] [-] FO : Disable confirm order when already clicked

---
 themes/default/js/order-opc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/default/js/order-opc.js b/themes/default/js/order-opc.js
index c053b38c2..162f95553 100644
--- a/themes/default/js/order-opc.js
+++ b/themes/default/js/order-opc.js
@@ -265,6 +265,7 @@ function confirmFreeOrder()
 	else
 		$('#opc_account-overlay').fadeIn('slow');
 	$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
+	$('#confirmOrder').attr('disabled', 'disabled');
 	$.ajax({
 		type: 'POST',
 		headers: { "cache-control": "no-cache" },
@@ -275,6 +276,7 @@ function confirmFreeOrder()
 		data: 'ajax=true&method=makeFreeOrder&token=' + static_token ,
 		success: function(html)
 		{
+			$('#confirmOrder').attr('disabled', '');
 			var array_split = html.split(':');
 			if (array_split[0] == 'freeorder')
 			{