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

// Merge -> revision 9061

Browse Source
This commit is contained in:
rMalie
2011-10-05 15:21:55 +00:00
parent d8f04cedb7
commit bbc6c6bdc4
53 changed files with 795 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/.htaccess
+1 -1
View File
@@ -1,3 +1,3 @@
<FilesMatch "\.tpl$">
Deny from all
</FilesMatch>
</FilesMatch>
themes/prestashop/css/addresses.css
+2
View File
@@ -24,6 +24,7 @@ ul.address {
position: relative;
width: 268px
}
ul.address.full_width { width: 536px }
ul.address li {
padding-left: 1.4em;
margin-top: 0.6em
@@ -39,6 +40,7 @@ li.address_title {
}
ul.item li.address_title { background-image: url('../img/address_alias_left.gif') }
ul.alternate_item li.address_title { background-image: url('../img/address_alias_right.gif') }
ul.full_width li.address_title { background-image: url('../img/address_alias_full_width.gif') }
li.address_name,
li.address_firstname,
li.address_lastname,
themes/prestashop/img/address_alias_full_width.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

themes/prestashop/js/order-opc.js
+44 -10
View File
@@ -66,21 +66,29 @@ function updateCarrierList(json)
else
var extraHtml = '';
if (taxEnabled && displayPrice == 0)
var price = carriers[i].price;
if (carriers[i].price == 0)
var price = txtFree;
else
var price = carriers[i].price_tax_exc;
{
if (taxEnabled && displayPrice == 0)
var price = '<span class="price">'+formatCurrency(carriers[i].price, currencyFormat, currencySign, currencyBlank)+'</span>';
else
var price = '<span class="price">'+formatCurrency(carriers[i].price_tax_exc, currencyFormat, currencySign, currencyBlank)+'</span>';
}
html = html +
'<tr class="'+itemType+'">'+
'<td class="carrier_action radio"><input type="radio" name="id_carrier" value="'+carriers[i].id_carrier+'" id="id_carrier'+carriers[i].id_carrier+'" onclick="updateCarrierSelectionAndGift();" '+extraHtml+' /></td>'+
'<td class="carrier_name"><label for="id_carrier'+carriers[i].id_carrier+'">'+name+'</label></td>'+
'<td class="carrier_infos">'+carriers[i].delay+'</td>'+
'<td class="carrier_price"><span class="price">'+formatCurrency(price, currencyFormat, currencySign, currencyBlank)+'</span>';
'<td class="carrier_price">'+price;
if (carriers[i].price != 0)
{
if (taxEnabled && displayPrice == 0)
html = html + ' ' + txtWithTax;
else
html = html + ' ' + txtWithoutTax;
}
html = html + '</td>'+
'</tr>';
}
@@ -143,7 +151,12 @@ function updateAddressSelection()
$('#opc_payment_methods-overlay').fadeOut('slow');
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save adresses \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to save adresses \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_account-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow');
$('#opc_payment_methods-overlay').fadeOut('slow');
}
});
}
@@ -226,7 +239,11 @@ function updateCarrierSelectionAndGift()
$('#opc_delivery_methods-overlay').fadeOut('slow');
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save carrier \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to save carrier \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_payment_methods-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow');
}
});
}
@@ -325,7 +342,12 @@ function saveAddress(type)
result = true;
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save adresses \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to save adresses \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_new_account-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow');
$('#opc_payment_methods-overlay').fadeOut('slow');
}
});
return result;
@@ -371,7 +393,11 @@ function updateNewAccountToAddressBlock()
});
});
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to send login informations \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to send login informations \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_delivery_methods-overlay').fadeOut('slow');
$('#opc_payment_methods-overlay').fadeOut('slow');
}
});
}
@@ -603,7 +629,12 @@ $(function() {
$('#opc_delivery_methods-overlay').fadeOut('slow');
$('#opc_payment_methods-overlay').fadeOut('slow');
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save account \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to save account \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_new_account-overlay').fadeOut('slow');
$('#opc_delivery_methods-overlay').fadeOut('slow');
$('#opc_payment_methods-overlay').fadeOut('slow');
}
});
return false;
});
@@ -633,7 +664,10 @@ $(function() {
else
$('#opc_delivery_methods-overlay').fadeOut('slow');
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save message \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
error: function(XMLHttpRequest, textStatus, errorThrown) {
alert("TECHNICAL ERROR: unable to save message \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);
$('#opc_delivery_methods-overlay').fadeOut('slow');
}
});
});
themes/prestashop/order-address.tpl
+5 -5
View File
@@ -91,8 +91,8 @@
function getAddressesTitles()
{ldelim}
return {ldelim}
'invoice': "{l s='Your billing address'}"
, 'delivery': "{l s='Your delivery address'}"
'invoice': "{l s='Your billing address'}",
'delivery': "{l s='Your delivery address'}"
{rdelim};
{rdelim}
@@ -173,7 +173,7 @@
</select>
</p>
<p class="checkbox">
<p class="checkbox" {if $cart->isVirtualCart()}style="display:none;"{/if}>
<input type="checkbox" name="same" id="addressesAreEquals" value="1" onclick="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}" {if $cart->id_address_invoice == $cart->id_address_delivery || $addresses|@count == 1}checked="checked"{/if} />
<label for="addressesAreEquals">{l s='Use the same address for billing.'}</label>
</p>
@@ -196,9 +196,9 @@
{/if}
</p>
<div class="clear"></div>
<ul class="address item" id="address_delivery">
<ul class="address item" id="address_delivery" {if $cart->isVirtualCart()}style="display:none;"{/if}>
</ul>
<ul class="address alternate_item" id="address_invoice">
<ul class="address alternate_item {if $cart->isVirtualCart()}full_width{/if}" id="address_invoice">
</ul>
<br class="clear" />
<p class="address_add submit">
themes/prestashop/order-carrier.tpl
+4
View File
@@ -50,6 +50,10 @@
{/literal}
//]]>
</script>
{else}
<script type="text/javascript">
var txtFree = "{l s='Free!'}";
</script>
{/if}
{if !$virtual_cart && $giftAllowed && $cart->gift == 1}
themes/prestashop/order-detail.tpl
+2 -2
View File
@@ -87,7 +87,7 @@
<p>{l s='Message:'} {$order->gift_message|nl2br}</p>
{/if}
<br />
<ul class="address item">
<ul class="address item" {if $order->isVirtual()}style="display:none;"{/if}>
<li class="address_title">{l s='Invoice'}</li>
{foreach from=$inv_adr_fields name=inv_loop item=field_item}
{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
@@ -100,7 +100,7 @@
{/foreach}
</ul>
<ul class="address alternate_item">
<ul class="address alternate_item {if $order->isVirtual()}full_width{/if}">
<li class="address_title">{l s='Delivery'}</li>
{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>
themes/prestashop/order-opc-new-account.tpl
+1
View File
@@ -60,6 +60,7 @@
<ul class="bullet">
<li>{l s='Personalized and secure access'}</li>
<li>{l s='Fast and easy check out'}</li>
<li>{l s='Separate billing and shipping addresses'}</li>
</ul>
<p>
<input type="button" class="button_large" id="opc_createAccount" value="{l s='Create an account'}" />