dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Rémi Gaillard
2013-04-16 14:14:36 +02:00
parent 96ee6386c1 ce02baf658
commit 22694898df
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/address.tpl
+1 -1
View File
@@ -220,7 +220,7 @@ $(function(){ldelim}
</p> </p>
<p class="required text" id="adress_alias"> <p class="required text" id="adress_alias">
<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label> <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> </p>
</fieldset> </fieldset>
<p class="submit2"> <p class="submit2">
themes/default/js/order-opc.js
+2
View File
@@ -265,6 +265,7 @@ function confirmFreeOrder()
else else
$('#opc_account-overlay').fadeIn('slow'); $('#opc_account-overlay').fadeIn('slow');
$('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow'); $('#opc_delivery_methods-overlay, #opc_payment_methods-overlay').fadeOut('slow');
$('#confirmOrder').attr('disabled', 'disabled');
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
headers: { "cache-control": "no-cache" }, headers: { "cache-control": "no-cache" },
@@ -275,6 +276,7 @@ function confirmFreeOrder()
data: 'ajax=true&method=makeFreeOrder&token=' + static_token , data: 'ajax=true&method=makeFreeOrder&token=' + static_token ,
success: function(html) success: function(html)
{ {
$('#confirmOrder').attr('disabled', '');
var array_split = html.split(':'); var array_split = html.split(':');
if (array_split[0] == 'freeorder') if (array_split[0] == 'freeorder')
{ {