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

// merge 1.4 (5397)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-04-22 16:00:58 +00:00
parent 7b4eda5137
commit 43b6a41bbc
126 changed files with 3390 additions and 1430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/addresses.tpl
+13 -11
View File
@@ -36,23 +36,25 @@
<h1>{l s='My addresses'}</h1>
<p>{l s='Please configure the desired billing and delivery addresses to be preselected when placing an order. You may also add additional addresses, useful for sending gifts or receiving your order at the office.'}</p>
{if $addresses}
{if $ordered_fields}
<div class="addresses">
<h3>{l s='Your addresses are listed below.'}</h3>
<p>{l s='Be sure to update them if they have changed.'}</p>
{assign var="adrs_style" value=$addresses_style}
{foreach from=$addresses item=address name=myLoop}
<ul class="address {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{else}item{/if}">
<li class="address_title">{$address.alias}</li>
{if $address.company}<li class="address_company">{$address.company}</li>{/if}
{if $address.vat_number}<li class="address_company">{$address.vat_number}</li>{/if}
<li class="address_name">{$address.firstname} {$address.lastname}</li>
<li class="address_address1">{$address.address1}</li>
{if $address.address2}<li class="address_address2">{$address.address2}</li>{/if}
<li class="address_city">{$address.postcode} {$address.city}</li>
<li class="address_country">{$address.country}{if isset($address.state)} ({$address.state}){/if}</li>
{if $address.phone}<li class="address_phone">{$address.phone}</li>{/if}
{if $address.phone_mobile}<li class="address_phone_mobile">{$address.phone_mobile}</li>{/if}
{foreach from=$ordered_fields name=adr_loop item=field_item}
{if $field_item eq "company" && $address.company}<li class="address_company">{$address.company}</li>
{elseif $field_item eq "vat_number" && $address.vat_number}<li class="address_company">{$address.vat_number}</li>
{elseif $field_item eq "address2" && $address.address2}<li class="address_address2">{$address.address2}</li>
{elseif $field_item eq "phone" && $address.phone}<li class="address_phone">{$address.phone}</li>
{elseif $field_item eq "phone_mobile" && $address.phone_mobile}<li class="address_phone_mobile">{$address.phone_mobile}</li>
{else}
{assign var=address_words value=" "|explode:$field_item}
<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$address.$word_item|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
{/if}
{/foreach}
<li class="address_update"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.id_address|intval}" title="{l s='Update'}">{l s='Update'}</a></li>
<li class="address_delete"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.id_address|intval}&amp;delete" onclick="return confirm('{l s='Are you sure?'}');" title="{l s='Delete'}">{l s='Delete'}</a></li>
</ul>
themes/prestashop/authentication.tpl
+24 -2
View File
@@ -130,7 +130,7 @@ $(function(){ldelim}
<input type="radio" name="id_gender" id="id_gender2" value="2" {if isset($smarty.post.id_gender) && $smarty.post.id_gender == '2'}checked="checked"{/if}>
<label for="id_gender2" class="top">{l s='Ms.'}</label>
</p>
<p class="required text">
<p class="required text">
<label for="firstname">{l s='First name'}</label>
<input type="text" class="text" id="firstname" name="firstname" onblur="$('#customer_firstname').val($(this).val());" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
<input type="hidden" class="text" id="customer_firstname" name="customer_firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}">
@@ -188,31 +188,38 @@ $(function(){ldelim}
</p>
{/if}
<h3>{l s='Delivery address'}</h3>
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"}
<p class="text">
<label for="company">{l s='Company'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
</p>
{elseif $field_name eq "vat_number"}
<div id="vat_number" style="display:none;">
<p class="text">
<label for="vat_number">{l s='VAT number'}</label>
<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" />
</p>
</div>
{elseif $field_name eq "address1"}
<p class="required text">
<label for="address1">{l s='Address'}</label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}">
<sup>*</sup>
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
<label for="postcode">{l s='Zip / Postal Code'}</label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onblur="$('#postcode').val($('#postcode').val().toUpperCase());">
<sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
<label for="city">{l s='City'}</label>
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}">
<sup>*</sup>
</p>
{elseif $field_name eq "country"}
<p class="required select">
<label for="id_country">{l s='Country'}</label>
<select name="id_country" id="id_country">
@@ -223,6 +230,7 @@ $(function(){ldelim}
</select>
<sup>*</sup>
</p>
{* DEBUG: elseif $field_name eq "state" *}
<p class="required id_state select">
<label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state">
@@ -230,11 +238,12 @@ $(function(){ldelim}
</select>
<sup>*</sup>
</p>
{elseif $field_name eq "phone"}
<p class="text">
<label for="phone">{l s='Phone'}</label>
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}"> <sup style="color:red;">*</sup>
</p>
{/if}{/foreach}
<p class="text submit">
<input type="submit" class="button" name="submitGuestAccount" id="submitGuestAccount" value="{l s='Continue'}">
</p>
@@ -331,45 +340,55 @@ $(function(){ldelim}
</fieldset>
<fieldset class="account_creation">
<h3>{l s='Your address'}</h3>
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"}
<p class="text">
<label for="company">{l s='Company'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
</p>
{elseif $field_name eq "vat_number"}
<div id="vat_number" style="display:none;">
<p class="text">
<label for="vat_number">{l s='VAT number'}</label>
<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" />
</p>
</div>
{elseif $field_name eq "firstname"}
<p class="required text">
<label for="firstname">{l s='First name'}</label>
<input type="text" class="text" id="firstname" name="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "lastname"}
<p class="required text">
<label for="lastname">{l s='Last name'}</label>
<input type="text" class="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "address1"}
<p class="required text">
<label for="address1">{l s='Address'}</label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "address2"}
<p class="text">
<label for="address2">{l s='Address (Line 2)'}</label>
<input type="text" class="text" name="address2" id="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{/if}" />
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
<label for="postcode">{l s='Zip / Postal Code'}</label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
<sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
<label for="city">{l s='City'}</label>
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "country"}
<p class="required select">
<label for="id_country">{l s='Country'}</label>
<select name="id_country" id="id_country">
@@ -380,6 +399,7 @@ $(function(){ldelim}
</select>
<sup>*</sup>
</p>
{* DEBUG: elseif $field_name eq "state" *}
<p class="required id_state select">
<label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state">
@@ -387,6 +407,8 @@ $(function(){ldelim}
</select>
<sup>*</sup>
</p>
{/if}
{/foreach}
<p class="textarea">
<label for="other">{l s='Additional information'}</label>
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
themes/prestashop/css/addresses.css
+16 -1
View File
@@ -40,14 +40,29 @@ 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') }
li.address_name,
li.address_firstname,
li.address_lastname,
li.address_update a,
li.address_delete a { color: #dd2a81 }
li.address_name,
li.address_firstname,
li.address_lastname,
li.address_company { font-weight: bold }
span.address_name,
span.address_firstname,
span.address_lastname,
span.address_update a,
span.address_delete a { color: #dd2a81 }
span.address_name,
span.address_firstname,
span.address_lastname,
span.address_company { font-weight: bold }
li.address_update,
li.address_delete {
background: transparent url('../img/bullet_myaccount.gif') no-repeat 0 0.5em!important;
background: transparent url('../img/bullet_myaccount.gif') no-repeat 0 0.4em;
margin-left: 1.4em
}
#center_column .address_add { padding: 1em 0 }
#center_column .address_add { padding: 1em 0 }
themes/prestashop/css/global.css
+1
View File
@@ -348,6 +348,7 @@ div.table_block {
margin: 0 auto 2em;
width: 541px
}
.std {font-size: 11px;}
table.std {
border-spacing: 0;
border-collapse: collapse;
themes/prestashop/js/order-address.js
+6 -18
View File
@@ -69,22 +69,10 @@ function updateAddressDisplay(addressType)
{
if (addresses.length <= 0)
return false;
var idAddress = $('select#id_address_' + addressType + '').val();
$('ul#address_' + addressType + ' li.address_company').html(addresses[idAddress][0]);
if(addresses[idAddress][0] == '')
$('ul#address_' + addressType + ' li.address_company').hide();
else
$('ul#address_' + addressType + ' li.address_company').show();
$('ul#address_' + addressType + ' li.address_name').html(addresses[idAddress][1] + ' ' + addresses[idAddress][2]);
$('ul#address_' + addressType + ' li.address_address1').html(addresses[idAddress][3]);
$('ul#address_' + addressType + ' li.address_address2').html(addresses[idAddress][4]);
if(addresses[idAddress][4] == '')
$('ul#address_' + addressType + ' li.address_address2').hide();
else
$('ul#address_' + addressType + ' li.address_address2').show();
$('ul#address_' + addressType + ' li.address_city').html(addresses[idAddress][5] + ' ' + addresses[idAddress][6]);
$('ul#address_' + addressType + ' li.address_country').html(addresses[idAddress][7] + (addresses[idAddress][8] != '' ? ' (' + addresses[idAddress][8] +')' : ''));
buildAddressBlock(idAddress, addressType, $('#address_'+ addressType));
// change update link
var link = $('ul#address_' + addressType + ' li.address_update a').attr('href');
var expression = /id_address=\d+/;
@@ -105,7 +93,7 @@ function updateAddresses()
dataType : "json",
data: 'processAddress=true&step=2&ajax=true&id_address_delivery=' + idAddress_delivery + '&id_address_invoice=' + idAddress_invoice+ '&token=' + static_token ,
success: function(jsonData)
{
{
if (jsonData.hasError)
{
var errors = '';
@@ -115,7 +103,7 @@ function updateAddresses()
errors += jsonData.errors[error] + "\n";
alert(errors);
}
},
},
error: function(XMLHttpRequest, textStatus, errorThrown) {alert("TECHNICAL ERROR: unable to save adresses \n\nDetails:\nError thrown: " + XMLHttpRequest + "\n" + 'Text status: ' + textStatus);}
});
}
}
themes/prestashop/lang/es.php
+36 -16
View File
@@ -256,15 +256,15 @@ $_LANG['my-account_95d2137c196c7f84df5753ed78f18332'] = 'Mis vales descuento';
$_LANG['my-account_8cf04a9734132302f96da8e113e80ce5'] = 'Inicio';
$_LANG['new-products_9ff0635f5737513b1a6f559ac2bff745'] = 'Nuevos productos';
$_LANG['new-products_d58424783355b6da2dedc302f2bf4065'] = 'No hay nuevos productos.';
$_LANG['order-address_da9d6ec2998a07c31ec9eb93c9f254ed'] = 'Su dirección de facturación';
$_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Su dirección de entrega';
$_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Actualizar';
$_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Direcciones';
$_LANG['order-address_d0748d2df4aed77bd7591b3ac6c52c83'] = 'Elija una dirección de entrega:';
$_LANG['order-address_d40f5cb3e1fbb5760a8d2a44a1241d4d'] = 'Usar la misma dirección para la facturación.';
$_LANG['order-address_82a7d396bbd6f6fef648578b4ae2ea81'] = 'Elija una dirección de facturación:';
$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Añadir';
$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Añadir nueva dirección';
$_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Su dirección de entrega';
$_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Actualizar';
$_LANG['order-address_da9d6ec2998a07c31ec9eb93c9f254ed'] = 'Su dirección de facturación';
$_LANG['order-address_617096c86d35478132502be00e12e016'] = 'Si desea dejarnos un comentario acerca de su pedido, por favor escríbalo a continuación.';
$_LANG['order-address_dd1f775e443ff3b9a89270713580a51b'] = 'Anterior';
$_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Siguiente';
@@ -507,8 +507,9 @@ $_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = '¡En rebajas!';
$_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = '¡Precio rebajado!';
$_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = '¡Solo por Internet!';
$_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Disponible';
$_LANG['product-list_cb3c718c905f00adbb6735f55bfb38ef'] = 'Producto disponible con otras opciones';
$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Agotado';
$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Añadir a la carrito';
$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Añadir al carrito';
$_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'Ver';
$_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Comparar';
$_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '--';
@@ -567,6 +568,8 @@ $_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Descargar';
$_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accesorios';
$_LANG['product_d3da97e2d9aee5c8fbe03156ad051c99'] = 'Más';
$_LANG['product_4351cfebe4b61d8aa5efa1d020710005'] = 'Ver';
$_LANG['product_cb3c718c905f00adbb6735f55bfb38ef'] = 'Producto disponoble con diferentes opciones';
$_LANG['product_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Agotado';
$_LANG['product_54c02ba7929b1fda4847991a45b58a48'] = 'Personalización del producto';
$_LANG['product_d5a90effea572da2df11559161c0930b'] = 'Después de guardar su producto personalizado, no olvide añadirlo a su carrito.';
$_LANG['product_e5a75e83f9fd2f5fdff337a46227b3c3'] = 'Formatos de archivo permitidos: GIF, JPG, PNG';
@@ -611,10 +614,10 @@ $_LANG['shopping-cart_a40cab5994f36d4c48103a22ca082e8f'] = 'Su carrito';
$_LANG['shopping-cart_5f6b9be870bc784ecc15ddb5dcf7f22e'] = 'Resumen de su carrito';
$_LANG['shopping-cart_879f6b8877752685a966564d072f498f'] = 'Su carrito está vacío';
$_LANG['shopping-cart_5af5f631f774a71445e3028253874394'] = 'Esta tienda no ha aceptado su pedido.';
$_LANG['shopping-cart_80501a4e00716f2b94f22a465db82b51'] = 'Último producto añadido';
$_LANG['shopping-cart_ab88d481b4332548cd3ca2aa26fd6edc'] = 'Su carrito contiene';
$_LANG['shopping-cart_f5bf48aa40cad7891eb709fcf1fde128'] = 'producto';
$_LANG['shopping-cart_86024cad1e83101d97359d7351051156'] = 'productos';
$_LANG['shopping-cart_80501a4e00716f2b94f22a465db82b51'] = 'Último producto añadido';
$_LANG['shopping-cart_ab88d481b4332548cd3ca2aa26fd6edc'] = 'Su carrito contiene';
$_LANG['shopping-cart_deb10517653c255364175796ace3553f'] = 'Producto';
$_LANG['shopping-cart_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Descripción';
$_LANG['shopping-cart_12d3c7a4296542c62474856ec452c045'] = 'Ref.';
@@ -622,17 +625,16 @@ $_LANG['shopping-cart_9ff9c46512c186ebae182519a55dc6a9'] = 'Dispo.';
$_LANG['shopping-cart_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Precio unitario';
$_LANG['shopping-cart_03ab340b3f99e03cff9e84314ead38c0'] = 'Cantidad';
$_LANG['shopping-cart_96b0141273eabab320119c467cdcaf17'] = 'Total';
$_LANG['shopping-cart_3a5199ec2407f4b2f90496072ea8f006'] = 'Total de productos sin IVA:';
$_LANG['shopping-cart_29cfbfc41066134782f966beefd63a4e'] = 'Total de productos IVA incluído:';
$_LANG['shopping-cart_db205f01b4fd580fb5daa9072d96849d'] = 'Total productos';
$_LANG['shopping-cart_21034ae6d01a83e702839a72ba8a77b0'] = 'sin IVA';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['shopping-cart_1f87346a16cf80c372065de3c54c86d9'] = 'con IVA';
$_LANG['shopping-cart_543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total de productos:';
$_LANG['shopping-cart_4e59b98d7fa1d964bfd9841ad5c34980'] = 'Total vales de reducción sin IVA:';
$_LANG['shopping-cart_28e014bf2ccc53bc1a8042ca57ca6645'] = 'Total vales de reducción IVA incluído:';
$_LANG['shopping-cart_2633d6725607d13e80f5e30514b91fbe'] = 'Total vales de reducción:';
$_LANG['shopping-cart_6f758a9cd90f467e432a019b87fee031'] = 'Total embalaje para regalo sin IVA:';
$_LANG['shopping-cart_b935a8c55ff8c1c967d6f848b375db81'] = 'Total embalaje para regalo IVA incluído:';
$_LANG['shopping-cart_ada0f55ef37f4928c5cd970f378c15e8'] = 'Total vales descuento';
$_LANG['shopping-cart_2633d6725607d13e80f5e30514b91fbe'] = 'Total vales descuento:';
$_LANG['shopping-cart_9cc000efe3e783af5bf114f2e6573156'] = 'Total embalaje para regalo';
$_LANG['shopping-cart_a12925b3d2beb085f9a024d8098b41dd'] = 'Total embalaje para regalo:';
$_LANG['shopping-cart_9a7dfcdac1fa244d3ddb36a9c0662c9e'] = 'Total gastos de envío sin IVA:';
$_LANG['shopping-cart_1d4c9008fd49770971ffc2e8f32df870'] = 'Total gastos de envío IVA incluído:';
$_LANG['shopping-cart_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total gastos de envío';
$_LANG['shopping-cart_691b338fa68b3c177c6ebbc745624c6a'] = 'Total gastos de envío:';
$_LANG['shopping-cart_1ad9dce3d19b51de499eeaa71418435b'] = 'Total sin IVA:';
$_LANG['shopping-cart_598a4c4d56197cc1f6bca50b20aa484a'] = 'Total de impuestos:';
@@ -640,7 +642,6 @@ $_LANG['shopping-cart_d4262a684450da4efdd912182c32f4d1'] = 'Total IVA incluído:
$_LANG['shopping-cart_66c4c5112f455a19afde47829df363fa'] = 'Total:';
$_LANG['shopping-cart_67db993438213ca5b77a394bce7d7b41'] = 'Cantidad restante que se añadirá a su carrito, afin de obtener el envío gratuito:';
$_LANG['shopping-cart_2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Texto Nº';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Eliminar';
$_LANG['shopping-cart_c8cd21bd2e33378f10611bc4498cf96f'] = 'Borrar esta personalización';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Añadir';
@@ -670,6 +671,14 @@ $_LANG['sitemap_af1b98adf7f686b84cd0b443e022b7a0'] = 'Categorías';
$_LANG['sitemap_453aceb005ceaf54a47da15fee8b2a26'] = 'Páginas';
$_LANG['sitemap_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contacto';
$_LANG['sitemap_34c869c542dee932ef8cd96d2f91cae6'] = 'Nuestras tiendas';
$_LANG['store_infos_6f8522e0610541f1ef215a22ffa66ff6'] = 'Lunes';
$_LANG['store_infos_5792315f09a5d54fb7e3d066672b507f'] = 'Martes';
$_LANG['store_infos_796c163589f295373e171842f37265d5'] = 'Miércoles';
$_LANG['store_infos_78ae6f0cd191d25147e252dc54768238'] = 'Jueves';
$_LANG['store_infos_c33b138a163847cdb6caeeb7c9a126b4'] = 'Viernes';
$_LANG['store_infos_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Sábado';
$_LANG['store_infos_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Domingo';
$_LANG['store_infos_ad179a1071ebd8b00e0ff4718301dcea'] = 'Horarios:';
$_LANG['stores_34c869c542dee932ef8cd96d2f91cae6'] = 'Nuestras tiendas';
$_LANG['stores_518c79bc64c2d9e528c1d56f7f2df9ac'] = 'Aquí tiene la lista detallada de nuestras tiendas, no dude en ponerse en contacto con nosotros:';
$_LANG['stores_bea91105dec892251f9a0ec77ccdb182'] = 'No se ha encontrado tienda, eliga un radio más amplio';
@@ -698,5 +707,16 @@ $_LANG['supplier-list_86024cad1e83101d97359d7351051156'] = 'productos';
$_LANG['supplier-list_3426bf3cca12b1f6550fd8bd36171e2f'] = 'ver productos';
$_LANG['supplier_4bbacadd33aff22ab7468fa4f9efd717'] = 'Lista de productos por proveedor:';
$_LANG['supplier_71a863ca23a2b5d1dc82e60b908576b5'] = 'No hay productos de este proveedor.';
$_LANG['live_edit_282f96c7d1ed98d24606d209dcad9842'] = 'Posición de los módulos guardada';
$_LANG['live_edit_4c546e1b3dc31d2cdcd4d0c23fad2f4b'] = '¿Estáseguro? Si cierra esta ventana, la posición no se guardará';
$_LANG['live_edit_d3d2e617335f08df83599665eef8a418'] = 'Cerrar';
$_LANG['live_edit_ea4788705e6873b424c65e91c2846b19'] = 'Anular';
$_LANG['live_edit_70d9be9b139893aa6c69b5e77e614311'] = 'Confirmar';
$_LANG['live_edit_1b7c6a7f9b72974ede874b8fba9547a0'] = 'Añadir este módulo';
$_LANG['live_edit_da87eac3848a0d55560bdd129a0e134b'] = 'Imposible suprimir el módulo de este hook';
$_LANG['live_edit_79030d996976f29a5e986a42d8f026e5'] = 'Imposible guardar la posición del módulo';
$_LANG['live_edit_3c5b87f318f203adbfcc5d6a68959359'] = 'Imposible cargar la lista de los módulos';
$_LANG['live_edit_c9cc8cce247e49bae79f15173ce97354'] = 'Guardar';
$_LANG['live_edit_d8dcfab18b3a6eba56d617dd1dcb1ba7'] = 'Cerrar Live Edit';
?>
themes/prestashop/lang/fr.php
+7 -9
View File
@@ -625,17 +625,16 @@ $_LANG['shopping-cart_9ff9c46512c186ebae182519a55dc6a9'] = 'Dispo.';
$_LANG['shopping-cart_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Prix unitaire';
$_LANG['shopping-cart_03ab340b3f99e03cff9e84314ead38c0'] = 'Qté';
$_LANG['shopping-cart_96b0141273eabab320119c467cdcaf17'] = 'Total';
$_LANG['shopping-cart_3a5199ec2407f4b2f90496072ea8f006'] = 'Total produits HT :';
$_LANG['shopping-cart_29cfbfc41066134782f966beefd63a4e'] = 'Total produits TTC :';
$_LANG['shopping-cart_db205f01b4fd580fb5daa9072d96849d'] = 'Total produits';
$_LANG['shopping-cart_21034ae6d01a83e702839a72ba8a77b0'] = 'HT';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ' :';
$_LANG['shopping-cart_1f87346a16cf80c372065de3c54c86d9'] = 'TTC';
$_LANG['shopping-cart_543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total produits :';
$_LANG['shopping-cart_4e59b98d7fa1d964bfd9841ad5c34980'] = 'Total bons de réduction HT :';
$_LANG['shopping-cart_28e014bf2ccc53bc1a8042ca57ca6645'] = 'Total bons de réduction TTC :';
$_LANG['shopping-cart_ada0f55ef37f4928c5cd970f378c15e8'] = 'Total bons de réduction';
$_LANG['shopping-cart_2633d6725607d13e80f5e30514b91fbe'] = 'Total bons de réduction :';
$_LANG['shopping-cart_6f758a9cd90f467e432a019b87fee031'] = 'Total emballage cadeau HT :';
$_LANG['shopping-cart_b935a8c55ff8c1c967d6f848b375db81'] = 'Total emballage cadeau TTC :';
$_LANG['shopping-cart_9cc000efe3e783af5bf114f2e6573156'] = 'Total emballage cadeau';
$_LANG['shopping-cart_a12925b3d2beb085f9a024d8098b41dd'] = 'Total emballage cadeau :';
$_LANG['shopping-cart_9a7dfcdac1fa244d3ddb36a9c0662c9e'] = 'Total frais de port HT :';
$_LANG['shopping-cart_1d4c9008fd49770971ffc2e8f32df870'] = 'Total frais de port TTC :';
$_LANG['shopping-cart_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total frais de port';
$_LANG['shopping-cart_691b338fa68b3c177c6ebbc745624c6a'] = 'Total frais de port :';
$_LANG['shopping-cart_1ad9dce3d19b51de499eeaa71418435b'] = 'Total HT :';
$_LANG['shopping-cart_598a4c4d56197cc1f6bca50b20aa484a'] = 'Total taxes :';
@@ -643,7 +642,6 @@ $_LANG['shopping-cart_d4262a684450da4efdd912182c32f4d1'] = 'Total TTC :';
$_LANG['shopping-cart_66c4c5112f455a19afde47829df363fa'] = 'Total :';
$_LANG['shopping-cart_67db993438213ca5b77a394bce7d7b41'] = 'Pour obtenir la gratuité des frais de port, vous devez encore commander pour';
$_LANG['shopping-cart_2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Texte n°';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ' :';
$_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Supprimer';
$_LANG['shopping-cart_c8cd21bd2e33378f10611bc4498cf96f'] = 'Supprimer cette personnalisation';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Ajouter';
themes/prestashop/order-address.tpl
+84 -17
View File
@@ -1,5 +1,5 @@
{*
* 2007-2011 PrestaShop
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
@@ -31,9 +31,91 @@
var orderProcess = 'order';
{/if}
var addresses = new Array();
var addresses_values = new Array();
{foreach from=$addresses key=k item=address}
addresses[{$address.id_address|intval}] = new Array('{$address.company|addslashes}', '{$address.firstname|addslashes}', '{$address.lastname|addslashes}', '{$address.address1|addslashes}', '{$address.address2|addslashes}', '{$address.postcode|addslashes}', '{$address.city|addslashes}', '{$address.country|addslashes}', '{$address.state|default:''|addslashes}');
addresses_values[{$address.id_address|intval}] = {ldelim}
company: '{$address.company|addslashes}'
,firstname: '{$address.firstname|addslashes}'
,lastname: '{$address.lastname|addslashes}'
,address1: '{$address.address1|addslashes}'
,address2: '{$address.address2|addslashes}'
,postcode: '{$address.postcode|addslashes}'
,city: '{$address.city|addslashes}'
,country: '{$address.country|addslashes}'
,state: '{$address.state|default:''|addslashes}'
{rdelim};
{/foreach}
var address_format = {ldelim}
invoice:[
{if isset($inv_adr_fields)}
{foreach from=$inv_adr_fields item=inv_field name=inv_loop}
{if !$smarty.foreach.inv_loop.first},{/if}"{$inv_field}"
{/foreach}
{/if}
]
, delivery:
[
{if isset($dlv_adr_fields)}
{foreach from=$dlv_adr_fields item=dlv_field name=dlv_loop}
{if !$smarty.foreach.dlv_loop.first},{/if}"{$dlv_field}"
{/foreach}
{/if}
]
{rdelim};
function buildAddressBlock(id_address, address_type, dest_comp)
{ldelim}
var adr_titles_vals = {ldelim}
'invoice': "{l s='Your billing address'}"
, 'delivery': "{l s='Your delivery address'}"
{rdelim};
var li_content = addresses_values[id_address];
var fields_name = ["title"];
fields_name = fields_name.concat(address_format[address_type]);
fields_name = fields_name.concat(["update"]);
dest_comp.html('');
li_content["title"] = adr_titles_vals[address_type];
li_content["update"] = '<a href="{$link->getPageLink('address.php', true)}?id_address={$address.id_address|intval}&amp;back=order.php&amp;step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a>';
appendAddressLis(dest_comp, fields_name, li_content);
{rdelim}
function appendAddressLis(dest_comp, fields_name, values)
{ldelim}
for (var item in fields_name)
{ldelim}
var name = fields_name[item];
var new_li = document.createElement('li');
new_li.className = 'address_'+ name;
new_li.innerHTML = getFieldValue(name, values);
dest_comp.append(new_li);
{rdelim}
{rdelim}
function getFieldValue(field_name, values)
{ldelim}
var reg=new RegExp("[ ]+", "g");
var items=field_name.split(reg);
var vals = new Array();
for (var field_item in items)
vals.push(values[items[field_item]]);
return vals.join(" ");
{rdelim}
//]]>
</script>
@@ -81,24 +163,8 @@
</p>
<div class="clear"></div>
<ul class="address item" id="address_delivery">
<li class="address_title">{l s='Your delivery address'}</li>
<li class="address_company"></li>
<li class="address_name"></li>
<li class="address_address1"></li>
<li class="address_address2"></li>
<li class="address_city"></li>
<li class="address_country"></li>
<li class="address_update"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.id_address|intval}&amp;back=order.php&amp;step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a></li>
</ul>
<ul class="address alternate_item" id="address_invoice">
<li class="address_title">{l s='Your billing address'}</li>
<li class="address_company"></li>
<li class="address_name"></li>
<li class="address_address1"></li>
<li class="address_address2"></li>
<li class="address_city"></li>
<li class="address_country"></li>
<li class="address_update"><a href="{$link->getPageLink('address.php', true)}?id_address={$address.id_address|intval}&amp;back=order.php&amp;step=1{if $back}&mod={$back}{/if}" title="{l s='Update'}">{l s='Update'}</a></li>
</ul>
<br class="clear" />
<p class="address_add submit">
@@ -122,3 +188,4 @@
{else}
</div>
{/if}
themes/prestashop/order-detail.tpl
+19 -16
View File
@@ -78,25 +78,28 @@
<br />
<ul class="address item">
<li class="address_title">{l s='Invoice'}</li>
{if $address_invoice->company}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>{/if}
<li class="address_name">{$address_invoice->firstname|escape:'htmlall':'UTF-8'} {$address_invoice->lastname|escape:'htmlall':'UTF-8'}</li>
<li class="address_address1">{$address_invoice->address1|escape:'htmlall':'UTF-8'}</li>
{if $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>{/if}
<li class="address_city">{$address_invoice->postcode|escape:'htmlall':'UTF-8'} {$address_invoice->city|escape:'htmlall':'UTF-8'}</li>
<li class="address_country">{$address_invoice->country|escape:'htmlall':'UTF-8'}{if $invoiceState} - {$invoiceState->name|escape:'htmlall':'UTF-8'}{/if}</li>
{if $address_invoice->phone}<li class="address_phone">{$address_invoice->phone|escape:'htmlall':'UTF-8'}</li>{/if}
{if $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</li>{/if}
{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>
{elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</li>
{else}
{assign var=address_words value=" "|explode:$field_item}
<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$address_invoice->$word_item|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
{/if}
{/foreach}
</ul>
<ul class="address alternate_item">
<li class="address_title">{l s='Delivery'}</li>
{if $address_delivery->company}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>{/if}
<li class="address_name">{$address_delivery->firstname|escape:'htmlall':'UTF-8'} {$address_delivery->lastname|escape:'htmlall':'UTF-8'}</li>
<li class="address_address1">{$address_delivery->address1|escape:'htmlall':'UTF-8'}</li>
{if $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>{/if}
<li class="address_city">{$address_delivery->postcode|escape:'htmlall':'UTF-8'} {$address_delivery->city|escape:'htmlall':'UTF-8'}</li>
<li class="address_country">{$address_delivery->country|escape:'htmlall':'UTF-8'}{if $deliveryState} - {$deliveryState->name|escape:'htmlall':'UTF-8'}{/if}</li>
{if $address_delivery->phone}<li class="address_phone">{$address_delivery->phone|escape:'htmlall':'UTF-8'}</li>{/if}
{if $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>{/if}
{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>
{elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>
{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>
{else}
{assign var=address_words value=" "|explode:$field_item}
<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item}">{$address_delivery->$word_item|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
{/if}
{/foreach}
</ul>
{$HOOK_ORDERDETAILDISPLAYED}
{if !$is_guest}<form action="{$link->getPageLink('order-follow.php', true)}" method="post">{/if}
themes/prestashop/order-opc-new-account.tpl
+37 -12
View File
@@ -180,50 +180,48 @@
</p>
{/if}
<h3>{l s='Delivery address'}</h3>
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"}
<p class="text">
<label for="company">{l s='Company'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($guestInformations) && $guestInformations.company}{$guestInformations.company}{/if}" />
</p>
<div id="vat_number_block" style="display:none;">
<p class="text">
<label for="vat_number">{l s='VAT number'}</label>
<input type="text" class="text" name="vat_number" id="vat_number" value="{if isset($guestInformations) && $guestInformations.vat_number}{$guestInformations.vat_number}{/if}" />
</p>
</div>
<p class="required text dni">
<label for="dni">{l s='Identification number'}</label>
<input type="text" class="text" name="dni" id="dni" value="{if isset($guestInformations) && $guestInformations.dni}{$guestInformations.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p>
{elseif $field_name eq "firstname"}
<p class="required text">
<label for="firstname">{l s='First name'}</label>
<input type="text" class="text" id="firstname" name="firstname" value="{if isset($guestInformations) && $guestInformations.firstname}{$guestInformations.firstname}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "lastname"}
<p class="required text">
<label for="lastname">{l s='Last name'}</label>
<input type="text" class="text" id="lastname" name="lastname" value="{if isset($guestInformations) && $guestInformations.lastname}{$guestInformations.lastname}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "address1"}
<p class="required text">
<label for="address1">{l s='Address'}</label>
<input type="text" class="text" name="address1" id="address1" value="{if isset($guestInformations) && $guestInformations.address1}{$guestInformations.address1}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "address2"}
<p class="text is_customer_param">
<label for="address2">{l s='Address (Line 2)'}</label>
<input type="text" class="text" name="address2" id="address2" value="" />
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
<label for="postcode">{l s='Zip / Postal code'}</label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($guestInformations) && $guestInformations.postcode}{$guestInformations.postcode}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
<sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
<label for="city">{l s='City'}</label>
<input type="text" class="text" name="city" id="city" value="{if isset($guestInformations) && $guestInformations.city}{$guestInformations.city}{/if}" />
<sup>*</sup>
</p>
{elseif $field_name eq "country"}
<p class="required select">
<label for="id_country">{l s='Country'}</label>
<select name="id_country" id="id_country">
@@ -234,6 +232,20 @@
</select>
<sup>*</sup>
</p>
{elseif $field_name eq "vat_number"}
<div id="vat_number_block" style="display:none;">
<p class="text">
<label for="vat_number">{l s='VAT number'}</label>
<input type="text" class="text" name="vat_number" id="vat_number" value="{if isset($guestInformations) && $guestInformations.vat_number}{$guestInformations.vat_number}{/if}" />
</p>
</div>
{/if}
{/foreach}
<p class="required text dni">
<label for="dni">{l s='Identification number'}</label>
<input type="text" class="text" name="dni" id="dni" value="{if isset($guestInformations) && $guestInformations.dni}{$guestInformations.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p>
<p class="required id_state select">
<label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state">
@@ -254,7 +266,7 @@
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="" />
</p>
<input type="hidden" name="alias" id="alias" value="{l s='My address'}" />
<p class="checkbox is_customer_param">
<input type="checkbox" name="invoice_address" id="invoice_address" />
<label for="invoice_address"><b>{l s='Please use another address for invoice'}</b></label>
@@ -262,10 +274,13 @@
<div id="opc_invoice_address" class="is_customer_param">
<h3>{l s='Invoice address'}</h3>
{foreach from=$inv_all_fields item=field_name}
{if $field_name eq "company"}
<p class="text is_customer_param">
<label for="company_invoice">{l s='Company'}</label>
<input type="text" class="text" id="company_invoice" name="company_invoice" value="" />
</p>
{elseif $field_name eq "vat_number"}
<div id="vat_number_block_invoice" class="is_customer_param" style="display:none;">
<p class="text">
<label for="vat_number_invoice">{l s='VAT number'}</label>
@@ -277,35 +292,42 @@
<input type="text" class="text" name="dni" id="dni" value="{if isset($guestInformations) && $guestInformations.dni}{$guestInformations.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
</p>
{elseif $field_name eq "firstname"}
<p class="required text">
<label for="firstname_invoice">{l s='First name'}</label>
<input type="text" class="text" id="firstname_invoice" name="firstname_invoice" value="" />
<sup>*</sup>
</p>
{elseif $field_name eq "lastname"}
<p class="required text">
<label for="lastname_invoice">{l s='Last name'}</label>
<input type="text" class="text" id="lastname_invoice" name="lastname_invoice" value="" />
<sup>*</sup>
</p>
{elseif $field_name eq "address1"}
<p class="required text">
<label for="address1_invoice">{l s='Address'}</label>
<input type="text" class="text" name="address1_invoice" id="address1_invoice" value="" />
<sup>*</sup>
</p>
{elseif $field_name eq "address2"}
<p class="text is_customer_param">
<label for="address2_invoice">{l s='Address (Line 2)'}</label>
<input type="text" class="text" name="address2_invoice" id="address2_invoice" value="" />
</p>
{elseif $field_name eq "postcode"}
<p class="required postcode text">
<label for="postcode_invoice">{l s='Zip / Postal Code'}</label>
<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
<sup>*</sup>
</p>
{elseif $field_name eq "city"}
<p class="required text">
<label for="city_invoice">{l s='City'}</label>
<input type="text" class="text" name="city_invoice" id="city_invoice" value="" />
<sup>*</sup>
</p>
{elseif $field_name eq "country"}
<p class="required select">
<label for="id_country_invoice">{l s='Country'}</label>
<select name="id_country_invoice" id="id_country_invoice">
@@ -316,6 +338,7 @@
</select>
<sup>*</sup>
</p>
{elseif $field_name eq "state"}
<p class="required id_state_invoice select" style="display:none;">
<label for="id_state_invoice">{l s='State'}</label>
<select name="id_state_invoice" id="id_state_invoice">
@@ -323,6 +346,8 @@
</select>
<sup>*</sup>
</p>
{/if}
{/foreach}
<p class="textarea is_customer_param">
<label for="other_invoice">{l s='Additional information'}</label>
<textarea name="other_invoice" id="other_invoice" cols="26" rows="3"></textarea>
themes/prestashop/product.tpl
+4 -4
View File
@@ -253,7 +253,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
<span class="our_price_display">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
<span id="our_price_display">{convertPrice price=$productPrice}</span>
{if $tax_enabled}
{if $tax_enabled && $display_tax_label == 1}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}
{/if}
@@ -269,7 +269,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
{if $priceDisplay >= 0 && $priceDisplay <= 2}
{if $productPriceWithoutRedution > $productPrice}
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span>
{if $tax_enabled}
{if $tax_enabled && $display_tax_label == 1}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}
{/if}
@@ -459,7 +459,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
{/if}
</p>
</li>
{/foreach}
</ul>
</div>
@@ -492,7 +492,7 @@ var fieldRequired = '{l s='Please fill in all required fields' js=1}';
<li class="customizationUploadLine{if $field.required} required{/if}">{assign var='key' value='pictures_'|cat:$product->id|cat:'_'|cat:$field.id_customization_field}
{if isset($pictures.$key)}<div class="customizationUploadBrowse">
<img src="{$pic_dir}{$pictures.$key}_small" alt="" />
<a href="{$link->getProductDeletePictureLink($product,{$field.id_customization_field})}" title="{l s='Delete'}" >
<a href="{* $link->getProductDeletePictureLink($product,{$field.id_customization_field})*}" title="{l s='Delete'}" >
<img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="customization_delete_icon" width="11" height="13" />
</a>
</div>{/if}
themes/prestashop/shopping-cart.tpl
+8 -8
View File
@@ -85,12 +85,12 @@
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_price">
<td colspan="6">{l s='Total products (tax excl.):'}</td>
<td colspan="6">{l s='Total products'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}</td>
<td class="price" id="total_product">{displayPrice price=$total_products}</td>
</tr>
{else}
<tr class="cart_total_price">
<td colspan="6">{l s='Total products (tax incl.):'}</td>
<td colspan="6">{l s='Total products'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}</td>
<td class="price" id="total_product">{displayPrice price=$total_products_wt}</td>
</tr>
{/if}
@@ -104,9 +104,9 @@
<td colspan="6">
{if $use_taxes}
{if $priceDisplay}
{l s='Total vouchers (tax excl.):'}
{l s='Total vouchers'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}
{else}
{l s='Total vouchers (tax incl.):'}
{l s='Total vouchers'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}
{/if}
{else}
{l s='Total vouchers:'}
@@ -128,9 +128,9 @@
<td colspan="6">
{if $use_taxes}
{if $priceDisplay}
{l s='Total gift-wrapping (tax excl.):'}
{l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}
{else}
{l s='Total gift-wrapping (tax incl.):'}
{l s='Total gift-wrapping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}
{/if}
{else}
{l s='Total gift-wrapping:'}
@@ -151,12 +151,12 @@
{if $use_taxes}
{if $priceDisplay}
<tr class="cart_total_delivery" {if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="6">{l s='Total shipping (tax excl.):'}</td>
<td colspan="6">{l s='Total shipping'}{if $display_tax_label} {l s='(tax excl.)'}{/if}{l s=':'}</td>
<td class="price" id="total_shipping">{displayPrice price=$shippingCostTaxExc}</td>
</tr>
{else}
<tr class="cart_total_delivery"{if $shippingCost <= 0} style="display:none;"{/if}>
<td colspan="6">{l s='Total shipping (tax incl.):'}</td>
<td colspan="6">{l s='Total shipping'}{if $display_tax_label} {l s='(tax incl.)'}{/if}{l s=':'}</td>
<td class="price" id="total_shipping" >{displayPrice price=$shippingCost}</td>
</tr>
{/if}
themes/prestashop/store_infos.tpl
+1 -1
View File
@@ -38,7 +38,7 @@
<table style="font-size: 9px;">
{foreach $days_datas as $one_day}
<tr>
<td style="width: 70px;">{l s=$one_day['day']}</td>
<td style="width: 70px;">{$one_day['day']}</td>
<td>{$one_day['hours']}</td>
</tr>
{/foreach}
themes/prestashop/stores.tpl
+3 -1
View File
@@ -27,6 +27,8 @@
{capture name=path}{l s='Our stores'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<script src="http://maps.google.com/maps/api/js?sensor=true">// DEBUG </script>
<h1>{l s='Our stores'}</h1>
{if $simplifiedStoresDiplay}
@@ -94,4 +96,4 @@
<th>{l s='Distance'}</th>
</tr>
</table>
{/if}
{/if}