Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts: admin-dev/themes/default/template/controllers/customer_threads/message.tpl admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl admin-dev/themes/default/template/controllers/modules/favorites.tpl admin-dev/themes/default/template/controllers/modules/list.tpl admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl admin-dev/themes/default/template/controllers/orders/form.tpl admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl admin-dev/themes/default/template/controllers/products/associations.tpl admin-dev/themes/default/template/controllers/products/combinations.tpl admin-dev/themes/default/template/controllers/products/images.tpl admin-dev/themes/default/template/controllers/products/informations.tpl admin-dev/themes/default/template/controllers/products/prices.tpl admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl admin-dev/themes/default/template/header.tpl admin-dev/themes/default/template/helpers/form/form.tpl admin-dev/themes/default/template/helpers/list/list_header.tpl classes/ProductSale.php classes/helper/HelperList.php controllers/admin/AdminCmsController.php controllers/admin/AdminCustomersController.php controllers/admin/AdminMetaController.php controllers/admin/AdminModulesController.php controllers/admin/AdminPerformanceController.php controllers/admin/AdminProductsController.php controllers/front/ParentOrderController.php install-dev/theme/views/welcome.phtml modules/blocknewproducts/blocknewproducts.php modules/blocktopmenu/blocktopmenu.php modules/importerosc/importerosc.php modules/mailalerts/mailalerts.php modules/shopimporter/shopimporter.php modules/statsstock/statsstock.php themes/default/css/product_list.css
This commit is contained in:
Kevin Granger
@@ -94,8 +94,8 @@ $(function(){ldelim}
|
||||
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'html'}{/if}{/if}" />
|
||||
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
|
||||
</p>
|
||||
{assign var="stateExist" value="false"}
|
||||
{assign var="postCodeExist" value="false"}
|
||||
{assign var="stateExist" value=false}
|
||||
{assign var="postCodeExist" value=false}
|
||||
{foreach from=$ordered_adr_fields item=field_name}
|
||||
{if $field_name eq 'company'}
|
||||
<p class="text">
|
||||
@@ -142,7 +142,7 @@ $(function(){ldelim}
|
||||
</p>
|
||||
{/if}
|
||||
{if $field_name eq 'postcode'}
|
||||
{assign var="postCodeExist" value="true"}
|
||||
{assign var="postCodeExist" value=true}
|
||||
<p class="required postcode text">
|
||||
<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
|
||||
<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase()); if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).css('background-color', '#DFF0D8'); else $(this).css('background-color', '#F2DEDE');" />
|
||||
@@ -192,7 +192,7 @@ $(function(){ldelim}
|
||||
{/if}
|
||||
{/if}
|
||||
{if $field_name eq 'State:name'}
|
||||
{assign var="stateExist" value="true"}
|
||||
{assign var="stateExist" value=true}
|
||||
<p class="required id_state select">
|
||||
<label for="id_state">{l s='State'} <sup>*</sup></label>
|
||||
<select name="id_state" id="id_state">
|
||||
@@ -201,14 +201,14 @@ $(function(){ldelim}
|
||||
</p>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{if $postCodeExist eq "false"}
|
||||
{if !$postCodeExist}
|
||||
<p class="required postcode text hidden">
|
||||
<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
|
||||
<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());"
|
||||
onkeyup="if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).css('background-color', '#DFF0D8'); else $(this).css('background-color', '#F2DEDE');" />
|
||||
</p>
|
||||
{/if}
|
||||
{if $stateExist eq "false"}
|
||||
{if !$stateExist}
|
||||
<p class="required id_state select">
|
||||
<label for="id_state">{l s='State'} <sup>*</sup></label>
|
||||
<select name="id_state" id="id_state">
|
||||
|
||||
@@ -53,23 +53,34 @@ var countriesNeedZipCode = new Array();
|
||||
{/if}
|
||||
{/foreach}
|
||||
{/if}
|
||||
$(function(){ldelim}
|
||||
$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
|
||||
{rdelim});
|
||||
//]]>
|
||||
{literal}
|
||||
$(document).ready(function() {
|
||||
$('#company').on('input',function(){
|
||||
vat_number();
|
||||
});
|
||||
vat_number();
|
||||
$('#company_invoice').on('input',function(){
|
||||
vat_number_invoice();
|
||||
});
|
||||
function vat_number()
|
||||
{
|
||||
if ($('#company').val() != '')
|
||||
if (($('#company').length) && ($('#company').val() != ''))
|
||||
$('#vat_number').show();
|
||||
else
|
||||
$('#vat_number').hide();
|
||||
}
|
||||
function vat_number_invoice()
|
||||
{
|
||||
if (($('#company_invoice').length) && ($('#company_invoice').val() != ''))
|
||||
$('#vat_number_block_invoice').show();
|
||||
else
|
||||
$('#vat_number_block_invoice').hide();
|
||||
}
|
||||
vat_number();
|
||||
vat_number_invoice();
|
||||
{/literal}
|
||||
$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{/if}]').prop('selected', true);
|
||||
{literal}
|
||||
});
|
||||
{/literal}
|
||||
</script>
|
||||
@@ -90,6 +101,10 @@ $(document).ready(function() {
|
||||
submitFunction();
|
||||
return false;
|
||||
});
|
||||
$('#invoice_address').click(function() {
|
||||
bindCheckbox();
|
||||
});
|
||||
bindCheckbox();
|
||||
});
|
||||
function submitFunction()
|
||||
{
|
||||
@@ -140,6 +155,24 @@ $(document).ready(function() {
|
||||
}
|
||||
});
|
||||
}
|
||||
function bindCheckbox()
|
||||
{
|
||||
if ($('#invoice_address:checked').length > 0)
|
||||
{
|
||||
$('#opc_invoice_address').slideDown('slow');
|
||||
if ($('#company_invoice').val() == '')
|
||||
$('#vat_number_block_invoice').hide();
|
||||
updateState('invoice');
|
||||
updateNeedIDNumber('invoice');
|
||||
updateZipCode('invoice');
|
||||
{/literal}
|
||||
$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{/if}]').prop('selected', true);
|
||||
$('.id_state_invoice option[value={if isset($smarty.post.id_state_invoice)}{$smarty.post.id_state_invoice|intval}{/if}]').prop('selected', true);
|
||||
{literal}
|
||||
}
|
||||
else
|
||||
$('#opc_invoice_address').slideUp('slow');
|
||||
}
|
||||
{/literal}
|
||||
</script>
|
||||
<!--{if isset($authentification_error)}
|
||||
@@ -167,7 +200,7 @@ $(document).ready(function() {
|
||||
<span><input type="text" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" class="account_input" /></span>
|
||||
</p>
|
||||
<p class="submit">
|
||||
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
|
||||
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back}" />{/if}
|
||||
<input type="submit" id="SubmitCreate" name="SubmitCreate" class="button_large" value="{l s='Create an account'}" />
|
||||
<input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" />
|
||||
</p>
|
||||
@@ -270,30 +303,35 @@ $(document).ready(function() {
|
||||
{/if}
|
||||
<h3>{l s='Delivery address'}</h3>
|
||||
{foreach from=$dlv_all_fields item=field_name}
|
||||
{if $field_name eq "company"}
|
||||
{if $field_name eq "company" && $b2b_enable}
|
||||
<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"}
|
||||
{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 dni">
|
||||
<label for="dni">{l s='Identification number'}</label>
|
||||
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
|
||||
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
|
||||
</p>
|
||||
{elseif $field_name eq "address1"}
|
||||
<p class="required text">
|
||||
<label for="address1">{l s='Address'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "postcode"}
|
||||
{assign var='postCodeExist' value=true}
|
||||
{elseif $field_name eq "postcode"}
|
||||
{assign var='postCodeExist' value=true}
|
||||
<p class="required postcode text">
|
||||
<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></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());" />
|
||||
</p>
|
||||
{elseif $field_name eq "city"}
|
||||
{elseif $field_name eq "city"}
|
||||
<p class="required text">
|
||||
<label for="city">{l s='City'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
|
||||
@@ -302,16 +340,16 @@ $(document).ready(function() {
|
||||
if customer hasn't update his layout address, country has to be verified
|
||||
but it's deprecated
|
||||
-->
|
||||
{elseif $field_name eq "Country:name" || $field_name eq "country"}
|
||||
{elseif $field_name eq "Country:name" || $field_name eq "country"}
|
||||
<p class="required select">
|
||||
<label for="id_country">{l s='Country'} <sup>*</sup></label>
|
||||
<select name="id_country" id="id_country">
|
||||
{foreach from=$countries item=v}
|
||||
<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
|
||||
<option value="{$v.id_country}"{if (isset($smarty.post.id_country) AND $smarty.post.id_country == $v.id_country) OR (!isset($smarty.post.id_country) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</p>
|
||||
{elseif $field_name eq "State:name"}
|
||||
{elseif $field_name eq "State:name"}
|
||||
{assign var='stateExist' value=true}
|
||||
<p class="required id_state select">
|
||||
<label for="id_state">{l s='State'} <sup>*</sup></label>
|
||||
@@ -319,11 +357,6 @@ $(document).ready(function() {
|
||||
<option value="">-</option>
|
||||
</select>
|
||||
</p>
|
||||
{elseif $field_name eq "phone"}
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
|
||||
<label for="phone">{l s='Phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}"/>
|
||||
</p>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{if $stateExist eq false}
|
||||
@@ -340,19 +373,106 @@ $(document).ready(function() {
|
||||
<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());" />
|
||||
</p>
|
||||
{/if}
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
|
||||
<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
|
||||
</p>
|
||||
<input type="hidden" name="alias" id="alias" value="{l s='My address'}" />
|
||||
<input type="hidden" name="is_new_customer" id="is_new_customer" value="0" />
|
||||
<!-- END Account -->
|
||||
<p class="checkbox">
|
||||
<input type="checkbox" name="invoice_address" id="invoice_address"{if isset($smarty.post.invoice_address) && $smarty.post.invoice_address} checked="checked"{/if} autocomplete="off"/>
|
||||
<label for="invoice_address"><b>{l s='Please use another address for invoice'}</b></label>
|
||||
</p>
|
||||
<div id="opc_invoice_address" class="hidden">
|
||||
{assign var=stateExist value=false}
|
||||
{assign var=postCodeExist value=false}
|
||||
<h3>{l s='Invoice address'}</h3>
|
||||
{foreach from=$inv_all_fields item=field_name}
|
||||
{if $field_name eq "company" && $b2b_enable}
|
||||
<p class="text">
|
||||
<label for="company_invoice">{l s='Company'}</label>
|
||||
<input type="text" class="text" id="company_invoice" name="company_invoice" value="{if isset($smarty.post.company_invoice)}{$smarty.post.company_invoice}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "vat_number"}
|
||||
<div id="vat_number_block_invoice" class="hidden">
|
||||
<p class="text">
|
||||
<label for="vat_number_invoice">{l s='VAT number'}</label>
|
||||
<input type="text" class="text" id="vat_number_invoice" name="vat_number_invoice" value="{if isset($smarty.post.vat_number_invoice)}{$smarty.post.vat_number_invoice}{/if}" />
|
||||
</p>
|
||||
</div>
|
||||
<p class="required text dni_invoice">
|
||||
<label for="dni">{l s='Identification number'}</label>
|
||||
<input type="text" class="text" name="dni_invoice" id="dni_invoice" value="{if isset($smarty.post.dni_invoice)}{$smarty.post.dni_invoice}{/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'} <sup>*</sup></label>
|
||||
<input type="text" class="text" id="firstname_invoice" name="firstname_invoice" value="{if isset($smarty.post.firstname_invoice)}{$smarty.post.firstname_invoice}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "lastname"}
|
||||
<p class="required text">
|
||||
<label for="lastname_invoice">{l s='Last name'} <sup>*</sup></label>
|
||||
<input type="text" class="text" id="lastname_invoice" name="lastname_invoice" value="{if isset($smarty.post.firstname_invoice)}{$smarty.post.firstname_invoice}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "address1"}
|
||||
<p class="required text">
|
||||
<label for="address1_invoice">{l s='Address'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="address1_invoice" id="address1_invoice" value="{if isset($smarty.post.address1_invoice)}{$smarty.post.address1_invoice}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "postcode"}
|
||||
{$postCodeExist = true}
|
||||
<p class="required postcode_invoice text">
|
||||
<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($smarty.post.postcode_invoice)}{$smarty.post.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
|
||||
</p>
|
||||
{elseif $field_name eq "city"}
|
||||
<p class="required text">
|
||||
<label for="city_invoice">{l s='City'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="city_invoice" id="city_invoice" value="{if isset($smarty.post.city_invoice)}{$smarty.post.city_invoice}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "country" || $field_name eq "Country:name"}
|
||||
<p class="required select">
|
||||
<label for="id_country_invoice">{l s='Country'} <sup>*</sup></label>
|
||||
<select name="id_country_invoice" id="id_country_invoice">
|
||||
<option value="">-</option>
|
||||
{foreach from=$countries item=v}
|
||||
<option value="{$v.id_country}"{if (isset($smarty.post.id_country_invoice) && $smarty.post.id_country_invoice == $v.id_country) OR (!isset($smarty.post.id_country_invoice) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</p>
|
||||
{elseif $field_name eq "state" || $field_name eq 'State:name'}
|
||||
{$stateExist = true}
|
||||
<p class="required id_state_invoice select" style="display:none;">
|
||||
<label for="id_state_invoice">{l s='State'} <sup>*</sup></label>
|
||||
<select name="id_state_invoice" id="id_state_invoice">
|
||||
<option value="">-</option>
|
||||
</select>
|
||||
</p>
|
||||
{/if}
|
||||
{/foreach}
|
||||
{if !$postCodeExist}
|
||||
<p class="required postcode_invoice text hidden">
|
||||
<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($smarty.post.postcode_invoice)}{$smarty.post.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
|
||||
</p>
|
||||
{/if}
|
||||
{if !$stateExist}
|
||||
<p class="required id_state_invoice select hidden">
|
||||
<label for="id_state_invoice">{l s='State'} <sup>*</sup></label>
|
||||
<select name="id_state_invoice" id="id_state_invoice">
|
||||
<option value="">-</option>
|
||||
</select>
|
||||
</p>
|
||||
{/if}
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
|
||||
<label for="phone_mobile_invoice">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="text" class="text" name="phone_mobile_invoice" id="phone_mobile_invoice" value="{if isset($smarty.post.phone_mobile_invoice)}{$smarty.post.phone_mobile_invoice}{/if}" />
|
||||
</p>
|
||||
<input type="hidden" name="alias_invoice" id="alias_invoice" value="{l s='My Invoice address'}" />
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="account_creation dni">
|
||||
<h3>{l s='Tax identification'}</h3>
|
||||
<p class="required text">
|
||||
<label for="dni">{l s='Identification number'}</label>
|
||||
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
|
||||
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
|
||||
</p>
|
||||
</fieldset>
|
||||
{$HOOK_CREATE_ACCOUNT_FORM}
|
||||
<p class="cart_navigation required submit">
|
||||
<span><sup>*</sup>{l s='Required field'}</span>
|
||||
@@ -532,7 +652,7 @@ $(document).ready(function() {
|
||||
<select name="id_country" id="id_country">
|
||||
<option value="">-</option>
|
||||
{foreach from=$countries item=v}
|
||||
<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
|
||||
<option value="{$v.id_country}"{if (isset($smarty.post.id_country) AND $smarty.post.id_country == $v.id_country) OR (!isset($smarty.post.id_country) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</p>
|
||||
@@ -565,13 +685,13 @@ $(document).ready(function() {
|
||||
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
|
||||
</p>
|
||||
{if isset($one_phone_at_least) && $one_phone_at_least}
|
||||
<p class="inline-infos">{l s='You must register at least one phone number.'}</p>
|
||||
{/if}
|
||||
<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
|
||||
{/if}
|
||||
<p class="text">
|
||||
<label for="phone">{l s='Home phone'}</label>
|
||||
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
|
||||
</p>
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if} text">
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
|
||||
<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
|
||||
</p>
|
||||
|
||||
+129
-148
@@ -1,167 +1,148 @@
|
||||
ul#product_list {
|
||||
list-style-type: none
|
||||
}
|
||||
#product_list li {
|
||||
margin-bottom: 14px;
|
||||
padding: 12px 8px;
|
||||
border: 1px solid #eee;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px
|
||||
}
|
||||
#product_list li a {
|
||||
color: #374853;
|
||||
text-decoration: none
|
||||
}
|
||||
|
||||
#product_list li {
|
||||
margin-bottom: 14px;
|
||||
padding: 12px 8px;
|
||||
border: 1px solid #eee;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px
|
||||
}
|
||||
#product_list li a {
|
||||
color: #374853;
|
||||
text-decoration: none
|
||||
}
|
||||
#product_list li .left_block {
|
||||
float:left;
|
||||
padding-top:58px;
|
||||
width:15px
|
||||
}
|
||||
#product_list li .left_block .compare label {display:none;}
|
||||
|
||||
#product_list li p.compare input {
|
||||
vertical-align: text-bottom
|
||||
}
|
||||
#product_list li .left_block .compare label {display:none;}
|
||||
|
||||
#product_list li p.compare input {
|
||||
vertical-align: text-bottom
|
||||
}
|
||||
#product_list li .center_block {
|
||||
float: left;
|
||||
padding:0 7px;
|
||||
width: 342px;/* 356 */
|
||||
border-right:1px dotted #ccc
|
||||
}
|
||||
#product_list a.product_img_link {
|
||||
overflow:hidden;
|
||||
position:relative;
|
||||
float: left;
|
||||
display:block;
|
||||
margin-right: 14px;
|
||||
border: 1px solid #ccc
|
||||
}
|
||||
#product_list a.product_img_link img {
|
||||
display: block;
|
||||
vertical-align: bottom
|
||||
}
|
||||
#product_list li span.new {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right:-30px;
|
||||
padding: 1px 4px;
|
||||
width: 101px;
|
||||
font-size:10px;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
-moz-transform: rotate(45deg);
|
||||
-webkit-transform: rotate(45deg);
|
||||
-o-transform:rotate(45deg);
|
||||
background-color: #990000;
|
||||
transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg); /* Newer browsers */
|
||||
}
|
||||
|
||||
.ie8 #product_list li span.new{top:111px;right:0;width:94%}
|
||||
.ie7 #product_list li span.new {top:111px;right:0;width:94%}
|
||||
#product_list li h3 {
|
||||
padding:0 0 10px 0;
|
||||
font-size:13px;
|
||||
color:#000
|
||||
}
|
||||
#product_list li a {
|
||||
color: #000;
|
||||
text-decoration: none;
|
||||
}
|
||||
#product_list a.product_img_link {
|
||||
overflow:hidden;
|
||||
position:relative;
|
||||
float: left;
|
||||
display:block;
|
||||
margin-right: 14px;
|
||||
border: 1px solid #ccc
|
||||
}
|
||||
#product_list a.product_img_link img {
|
||||
display: block;
|
||||
vertical-align: bottom
|
||||
}
|
||||
#product_list li span.new {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right:-30px;
|
||||
padding: 1px 4px;
|
||||
width: 101px;
|
||||
font-size:10px;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
text-transform: uppercase;
|
||||
-moz-transform: rotate(45deg);
|
||||
-webkit-transform: rotate(45deg);
|
||||
-o-transform:rotate(45deg);
|
||||
background-color: #990000;
|
||||
transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg); /* Newer browsers */
|
||||
}
|
||||
|
||||
#product_list li p.product_desc {
|
||||
overflow: hidden;
|
||||
padding:0;
|
||||
line-height:16px;
|
||||
}
|
||||
#product_list li p.product_desc,
|
||||
#product_list li p.product_desc a {
|
||||
color:#666;
|
||||
}
|
||||
.ie8 #product_list li span.new{top:111px;right:0;width:94%}
|
||||
.ie7 #product_list li span.new {top:111px;right:0;width:94%}
|
||||
#product_list li h3 {
|
||||
padding:0 0 10px 0;
|
||||
font-size:13px;
|
||||
color:#000
|
||||
}
|
||||
#product_list li a {
|
||||
color: #000;
|
||||
text-decoration: none;
|
||||
}
|
||||
#product_list li p.product_desc {
|
||||
overflow: hidden;
|
||||
padding:0;
|
||||
line-height:16px;
|
||||
}
|
||||
#product_list li p.product_desc,
|
||||
#product_list li p.product_desc a {
|
||||
color:#666;
|
||||
}
|
||||
|
||||
#product_list li .right_block {
|
||||
position:relative;
|
||||
float: left;
|
||||
width: 145px;
|
||||
text-align: right
|
||||
position:relative;
|
||||
float: left;
|
||||
width: 145px;
|
||||
text-align: right
|
||||
}
|
||||
#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
|
||||
display: block;
|
||||
font-weight: bold;
|
||||
color: #990000;
|
||||
text-transform: uppercase
|
||||
}
|
||||
#product_list li .discount {
|
||||
position:absolute;
|
||||
top:0;
|
||||
right:0;
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
padding: 1px 5px;
|
||||
font-size: 10px;
|
||||
color: #fff;
|
||||
text-transform: uppercase;
|
||||
background: none repeat scroll 0 0 #9B0000
|
||||
}
|
||||
#product_list li .online_only {
|
||||
margin:0 0 10px 0
|
||||
}
|
||||
#product_list li .content_price {
|
||||
margin:26px 0 15px 0;
|
||||
}
|
||||
#product_list li .price {
|
||||
display: block;
|
||||
margin-bottom: 15px;
|
||||
font-weight:bold;
|
||||
font-size: 18px;
|
||||
color:#990000
|
||||
}
|
||||
#product_list li span.availability {
|
||||
color: #488C40
|
||||
}
|
||||
#product_list li .ajax_add_to_cart_button {
|
||||
padding-left: 20px
|
||||
}
|
||||
#product_list li .ajax_add_to_cart_button span {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: -1px;
|
||||
left: -12px;
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
|
||||
}
|
||||
#product_list li .lnk_view {
|
||||
display: block;
|
||||
margin-top:15px;
|
||||
padding:0 10px;
|
||||
border:none;
|
||||
font-weight:bold;
|
||||
color:#0088CC;
|
||||
background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
|
||||
}
|
||||
#product_list li .lnk_view:hover {text-decoration:underline}
|
||||
|
||||
#color_to_pick_list {
|
||||
list-style-type:none;
|
||||
width:125px;
|
||||
float:left;
|
||||
}
|
||||
|
||||
#color_to_pick_list li {
|
||||
float:left;
|
||||
clear:none;
|
||||
padding:0;
|
||||
margin-bottom:1px;
|
||||
}
|
||||
|
||||
#color_to_pick_list li a {
|
||||
display:block;
|
||||
height:20px;
|
||||
width:20px;
|
||||
}
|
||||
#product_list li .discount, ul#product_list li .on_sale, ul#product_list li .online_only {
|
||||
display: block;
|
||||
font-weight: bold;
|
||||
color: #990000;
|
||||
text-transform: uppercase
|
||||
}
|
||||
#product_list li .discount {
|
||||
position:absolute;
|
||||
top:0;
|
||||
right:0;
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
padding: 1px 5px;
|
||||
font-size: 10px;
|
||||
color: #fff;
|
||||
text-transform: uppercase;
|
||||
background: none repeat scroll 0 0 #9B0000
|
||||
}
|
||||
#product_list li .online_only {
|
||||
margin:0 0 10px 0
|
||||
}
|
||||
#product_list li .content_price {
|
||||
margin:26px 0 15px 0;
|
||||
}
|
||||
#product_list li .price {
|
||||
display: block;
|
||||
margin-bottom: 15px;
|
||||
font-weight:bold;
|
||||
font-size: 18px;
|
||||
color:#990000
|
||||
}
|
||||
#product_list li span.availability {
|
||||
color: #488C40
|
||||
}
|
||||
#product_list li span.warning_inline {
|
||||
color: red
|
||||
}
|
||||
#product_list li .ajax_add_to_cart_button {
|
||||
padding-left: 20px
|
||||
}
|
||||
#product_list li .ajax_add_to_cart_button span {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: -1px;
|
||||
left: -12px;
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
|
||||
}
|
||||
#product_list li .lnk_view {
|
||||
display: block;
|
||||
margin-top:15px;
|
||||
padding:0 10px;
|
||||
border:none;
|
||||
font-weight:bold;
|
||||
color:#0088CC;
|
||||
background:url(../img/arrow_right_1.png) no-repeat 100% 4px transparent
|
||||
}
|
||||
#product_list li .lnk_view:hover {text-decoration:underline}
|
||||
@@ -308,7 +308,7 @@ function saveAddress(type)
|
||||
params += 'address2='+encodeURIComponent($('#address2'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
params += 'postcode='+encodeURIComponent($('#postcode'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
params += 'city='+encodeURIComponent($('#city'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
params += 'id_country='+encodeURIComponent($('#id_country').val())+'&';
|
||||
params += 'id_country='+encodeURIComponent($('#id_country'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
if ($('#id_state'+(type == 'invoice' ? '_invoice' : '')).val())
|
||||
params += 'id_state='+encodeURIComponent($('#id_state'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
params += 'other='+encodeURIComponent($('#other'+(type == 'invoice' ? '_invoice' : '')).val())+'&';
|
||||
|
||||
@@ -417,14 +417,20 @@ function displayImage(domAAroundImgThumb, no_animation)
|
||||
{
|
||||
if (typeof(no_animation) == 'undefined')
|
||||
no_animation = false;
|
||||
if (domAAroundImgThumb.attr('href'))
|
||||
if (domAAroundImgThumb.prop('href'))
|
||||
{
|
||||
var newSrc = domAAroundImgThumb.attr('href').replace('thickbox', 'large');
|
||||
if ($('#bigpic').attr('src') != newSrc)
|
||||
var new_src = domAAroundImgThumb.prop('href').replace('thickbox', 'large');
|
||||
var new_title = domAAroundImgThumb.prop('title');
|
||||
var new_href = domAAroundImgThumb.prop('href');
|
||||
if ($('#bigpic').prop('src') != new_src)
|
||||
{
|
||||
$('#bigpic').attr('src', newSrc).load(function() {
|
||||
$('#bigpic').prop({
|
||||
'src' : new_src,
|
||||
'alt' : new_title,
|
||||
'title' : new_title
|
||||
}).load(function(){
|
||||
if (typeof(jqZoomEnabled) != 'undefined' && jqZoomEnabled)
|
||||
$(this).attr('rel', domAAroundImgThumb.attr('href'));
|
||||
$(this).prop('rel', new_href);
|
||||
});
|
||||
}
|
||||
$('#views_block li a').removeClass('shown');
|
||||
|
||||
@@ -113,7 +113,7 @@ function searchLocationsNear(center)
|
||||
createMarker(latlng, name, address, other, id_store, has_store_picture);
|
||||
bounds.extend(latlng);
|
||||
|
||||
$('#stores-table tr:last').after('<tr class="node"><td class="num">'+parseInt(i + 1)+'</td><td><b>'+name+'</b>'+(has_store_picture === 1 ? '<br /><img src="'+img_store_dir+parseInt(id_store)+'-medium.jpg" alt="" />' : '')+'</td><td>'+address+(phone !== '' ? '<br /><br />'+translation_4+' '+phone : '')+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
|
||||
$('#stores-table tr:last').after('<tr class="node"><td class="num">'+parseInt(i + 1)+'</td><td><b>'+name+'</b>'+(has_store_picture === 1 ? '<br /><img src="'+img_store_dir+parseInt(id_store)+'-medium.jpg" alt="" />' : '')+'</td><td>'+address+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
|
||||
$('#stores-table').show();
|
||||
}
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ function formatCurrency(price, currencyFormat, currencySign, currencyBlank)
|
||||
if (currencyFormat == 4)
|
||||
return (formatNumber(price, priceDisplayPrecision, ',', '.') + blank + currencySign);
|
||||
if (currencyFormat == 5)
|
||||
return (formatNumber(price, priceDisplayPrecision, ' ', '.') + blank + currencySign);
|
||||
return (currencySign + blank + formatNumber(price, priceDisplayPrecision, '\'', '.'));
|
||||
return price;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<div class="description_box">
|
||||
{if !empty($manufacturer->short_description)}
|
||||
<p>{$manufacturer->short_description}</p>
|
||||
<p class="hide_desc">{$manufacturer->description}</p>
|
||||
<div class="hide_desc">{$manufacturer->description}</div>
|
||||
<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide(); return false;">{l s='More'}</a>
|
||||
{else}
|
||||
<p>{$manufacturer->description}</p>
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
{/foreach}
|
||||
{else}
|
||||
<select id="id_contact" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
|
||||
<option value="0">-- {l s='Subject Heading'} --</option>
|
||||
<option value="0">- {l s='Subject Heading'} -</option>
|
||||
{foreach from=$contacts item=contact}
|
||||
<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
@@ -65,7 +65,7 @@
|
||||
{if (!isset($customerThread.id_order) || $customerThread.id_order > 0)}
|
||||
<fieldset>
|
||||
{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
|
||||
<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>
|
||||
<select name="id_order" ><option value="0">- {l s='Order ID'} -</option>
|
||||
{foreach from=$orderList item=order}
|
||||
<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
{if !isset($customerThread.id_product)}
|
||||
{foreach from=$orderedProductList key=id_order item=products name=products}
|
||||
<select name="id_product"><option value="0">-- {l s='Product'} --</option>
|
||||
<select name="id_product"><option value="0">- {l s='Product'} -</option>
|
||||
{foreach from=$products item=product}
|
||||
<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
|
||||
{/foreach}
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
{if $invoice AND $invoiceAllowed}
|
||||
<li>
|
||||
<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
|
||||
<a href="{$link->getPageLink('pdf-invoice', true)}?id_order={$order->id|intval}{if $is_guest}&secure_key={$order->secure_key}{/if}" data-ajax="false">{l s='Download your invoice as a PDF file.'}</li>
|
||||
<a href="{$link->getPageLink('pdf-invoice', true)}?id_order={$order->id|intval}{if $is_guest}&secure_key={$order->secure_key}{/if}" data-ajax="false">{l s='Download your invoice as a PDF file.'}
|
||||
</li>
|
||||
{/if}
|
||||
{if $order->recyclable}
|
||||
@@ -278,7 +278,7 @@
|
||||
<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
|
||||
<fieldset>
|
||||
<label for="id_product">{l s='Product'}</label>
|
||||
<select name="id_product" style="width:300px;">
|
||||
<select name="id_product">
|
||||
<option value="0">{l s='-- Choose --'}</option>
|
||||
{foreach from=$products item=product name=products}
|
||||
<option value="{$product.product_id}">{$product.product_name}</option>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<input type="hidden" name="orderby" value="position" />
|
||||
<input type="hidden" name="controller" value="search" />
|
||||
<input type="hidden" name="orderway" value="desc" />
|
||||
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
|
||||
<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{Tools::htmlentitiesUTF8($smarty.get.search_query)|stripslashes}{/if}" />
|
||||
<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
|
||||
</p>
|
||||
</form>
|
||||
|
||||
@@ -171,10 +171,13 @@
|
||||
<td>
|
||||
<div class="delivery_option_price">
|
||||
{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
|
||||
|
||||
{if $use_taxes == 1}
|
||||
{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
|
||||
{else}
|
||||
{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
|
||||
{if $priceDisplay == 1}
|
||||
{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
|
||||
{else}
|
||||
{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
|
||||
{/if}
|
||||
{/if}
|
||||
{else}
|
||||
{l s='Free'}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
|
||||
{if isset($order)}
|
||||
<form action="{if isset($opc) && $opc}{$link->getPageLink('order-opc', true)}{else}{$link->getPageLink('order', true)}{/if}" method="post" class="submit">
|
||||
<div>
|
||||
<input type="hidden" value="{$order->id}" name="id_order"/>
|
||||
@@ -424,3 +424,4 @@
|
||||
{else}
|
||||
<p><img src="{$img_dir}icon/infos.gif" alt="" class="icon" /> {l s='You cannot return merchandise with a guest account'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
@@ -70,7 +70,7 @@
|
||||
{foreach from=$ordersReturn item=return name=myLoop}
|
||||
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
|
||||
<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
|
||||
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
|
||||
<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{$return.reference}</a></td>
|
||||
<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
|
||||
<td class="bold">{dateFormat date=$return.date_add full=0}</td>
|
||||
<td class="history_invoice">
|
||||
|
||||
@@ -74,19 +74,18 @@
|
||||
{literal}
|
||||
function vat_number()
|
||||
{
|
||||
if ($('#company').val() != '')
|
||||
if (($('#company').length) && ($('#company').val() != ''))
|
||||
$('#vat_number_block').show();
|
||||
else
|
||||
$('#vat_number_block').hide();
|
||||
}
|
||||
function vat_number_invoice()
|
||||
{
|
||||
if ($('#company_invoice').val() != '')
|
||||
if (($('#company_invoice').length) && ($('#company_invoice').val() != ''))
|
||||
$('#vat_number_block_invoice').show();
|
||||
else
|
||||
$('#vat_number_block_invoice').hide();
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$('#company').on('input',function(){
|
||||
vat_number();
|
||||
@@ -96,6 +95,10 @@
|
||||
});
|
||||
vat_number();
|
||||
vat_number_invoice();
|
||||
{/literal}
|
||||
$('.id_state option[value={if isset($guestInformations.id_state)}{$guestInformations.id_state|intval}{/if}]').prop('selected', true);
|
||||
$('.id_state_invoice option[value={if isset($guestInformations.id_state_invoice)}{$guestInformations.id_state_invoice|intval}{/if}]').prop('selected', true);
|
||||
{literal}
|
||||
});
|
||||
{/literal}
|
||||
</script>
|
||||
@@ -203,7 +206,7 @@
|
||||
{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="" />
|
||||
<input type="text" class="text" name="address2" id="address2" value="{if isset($guestInformations) && $guestInformations.address2}{$guestInformations.address2}{/if}" />
|
||||
</p>
|
||||
{elseif $field_name eq "postcode"}
|
||||
{$postCodeExist = true}
|
||||
@@ -279,7 +282,7 @@
|
||||
<input type="hidden" name="alias" id="alias" value="{l s='My address'}"/>
|
||||
|
||||
<p class="checkbox">
|
||||
<input type="checkbox" name="invoice_address" id="invoice_address" autocomplete="off"/>
|
||||
<input type="checkbox" name="invoice_address" id="invoice_address"{if (isset($smarty.post.invoice_address) && $smarty.post.invoice_address) || (isset($guestInformations) && $guestInformations.invoice_address)} checked="checked"{/if} autocomplete="off"/>
|
||||
<label for="invoice_address"><b>{l s='Please use another address for invoice'}</b></label>
|
||||
</p>
|
||||
|
||||
@@ -289,7 +292,7 @@
|
||||
<h3>{l s='Invoice address'}</h3>
|
||||
{foreach from=$inv_all_fields item=field_name}
|
||||
{if $field_name eq "company" && $b2b_enable}
|
||||
<p class="text is_customer_param">
|
||||
<p class="text">
|
||||
<label for="company_invoice">{l s='Company'}</label>
|
||||
<input type="text" class="text" id="company_invoice" name="company_invoice" value="" />
|
||||
</p>
|
||||
@@ -329,7 +332,7 @@
|
||||
{$postCodeExist = true}
|
||||
<p class="required postcode_invoice text">
|
||||
<label for="postcode_invoice">{l s='Zip / Postal Code'} <sup>*</sup></label>
|
||||
<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($guestInformations) && $guestInformations.postcode_invoice}{$guestInformations.postcode_invoice}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
|
||||
<input type="text" class="text" name="postcode_invoice" id="postcode_invoice" value="{if isset($guestInformations) && $guestInformations.postcode_invoice}{$guestInformations.postcode_invoice}{/if}" onkeyup="$('#postcode_invoice').val($('#postcode_invoice').val().toUpperCase());" />
|
||||
</p>
|
||||
{elseif $field_name eq "city"}
|
||||
<p class="required text">
|
||||
@@ -375,13 +378,13 @@
|
||||
<textarea name="other_invoice" id="other_invoice" cols="26" rows="3"></textarea>
|
||||
</p>
|
||||
{if isset($one_phone_at_least) && $one_phone_at_least}
|
||||
<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
|
||||
<p class="inline-infos required is_customer_param">{l s='You must register at least one phone number.'}</p>
|
||||
{/if}
|
||||
<p class="text">
|
||||
<p class="text is_customer_param">
|
||||
<label for="phone_invoice">{l s='Home phone'}</label>
|
||||
<input type="text" class="text" name="phone_invoice" id="phone_invoice" value="{if isset($guestInformations) && $guestInformations.phone_invoice}{$guestInformations.phone_invoice}{/if}" />
|
||||
</p>
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text is_customer_param">
|
||||
<p class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}text">
|
||||
<label for="phone_mobile_invoice">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
|
||||
<input type="text" class="text" name="phone_mobile_invoice" id="phone_mobile_invoice" value="{if isset($guestInformations) && $guestInformations.phone_mobile_invoice}{$guestInformations.phone_mobile_invoice}{/if}" />
|
||||
</p>
|
||||
@@ -402,4 +405,4 @@
|
||||
</fieldset>
|
||||
</form>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
|
||||
<div class="content_price">
|
||||
{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}<span class="price" style="display: inline;">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span><br />{/if}
|
||||
{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}{l s='Out of stock'}{/if}</span>{/if}
|
||||
{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}<span class="availability">{if ($product.allow_oosp || $product.quantity > 0)}{l s='Available'}{elseif (isset($product.quantity_all_versions) && $product.quantity_all_versions > 0)}{l s='Product available with different options'}{else}<span class="warning_inline">{l s='Out of stock'}</span>{/if}</span>{/if}
|
||||
</div>
|
||||
{if isset($product.online_only) && $product.online_only}<span class="online_only">{l s='Online only'}</span>{/if}
|
||||
{/if}
|
||||
|
||||
@@ -184,7 +184,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
|
||||
<div id="image-block">
|
||||
{if $have_image}
|
||||
<span id="view_full_size">
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" alt="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
|
||||
<span class="span_link">{l s='Maximize'}</span>
|
||||
</span>
|
||||
{else}
|
||||
@@ -200,16 +200,21 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
|
||||
{if isset($images) && count($images) > 3}<span class="view_scroll_spacer"><a id="view_scroll_left" class="hidden" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Previous'}</a></span>{/if}
|
||||
<div id="thumbs_list">
|
||||
<ul id="thumbs_list_frame">
|
||||
{if isset($images)}
|
||||
{foreach from=$images item=image name=thumbnails}
|
||||
{if isset($images)}
|
||||
{foreach from=$images item=image name=thumbnails}
|
||||
{assign var=imageIds value="`$product->id`-`$image.id_image`"}
|
||||
{if !empty($image.legend)}
|
||||
{assign var=imageTitlte value=$image.legend|escape:'htmlall':'UTF-8'}
|
||||
{else}
|
||||
{assign var=imageTitlte value=$product->name|escape:'htmlall':'UTF-8'}
|
||||
{/if}
|
||||
<li id="thumbnail_{$image.id_image}">
|
||||
<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$image.legend|htmlspecialchars}">
|
||||
<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html'}" alt="{$image.legend|htmlspecialchars}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
|
||||
<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$imageTitlte}">
|
||||
<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html'}" alt="{$imageTitlte}" title="{$imageTitlte}" height="{$mediumSize.height}" width="{$mediumSize.width}" />
|
||||
</a>
|
||||
</li>
|
||||
{/foreach}
|
||||
{/if}
|
||||
{/foreach}
|
||||
{/if}
|
||||
</ul>
|
||||
</div>
|
||||
{if isset($images) && count($images) > 3}<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">{l s='Next'}</a>{/if}
|
||||
|
||||
Reference in New Issue
Block a user